1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
|
$NetBSD: patch-af,v 1.2 2010/07/17 08:57:18 obache Exp $
--- skkserv/skkserv.c.orig 1997-01-20 19:16:36.000000000 +0000
+++ skkserv/skkserv.c
@@ -100,8 +100,10 @@
#define SERVER_NOT_FOUND "4"
#define SERVER_FULL "9"
+#define warn(m) \
+ {if (debug) fprintf(errout, "%s: %s\n", pgmnm, m);}
#define err(m) \
- {if (debug) fprintf(errout, "%s: %s\n", pgmnm, m); exit(1);}
+ {warn(m); exit(1);}
/*
* Global Variables
@@ -121,6 +123,9 @@ int format; /* 0 (old-style) / non-0 (n
int jtab1[KANAMOJI]; /* index-table by 1st letter (1st part)*/
int jtab2[KANAMOJI]; /* index-table by 1st letter (2nd part)*/
int initsock; /* socket for waiting requests */
+#ifdef PF_INET6
+int initsock6; /* IPv6 socket for waiting requests */
+#endif
int clientsock[MAXCLNT]; /* socket for each client */
int nclients; /* max index for active clients */
@@ -130,8 +135,18 @@ char *argv[];
int parg;
int setjisho = 0;
int ctlterm; /* fildes for control terminal */
- void reread();
+ RETSIGTYPE req_reread();
+
+#ifdef SKKSERV_UID
+ gid_t gid = SKKSERV_GID;
+ /* revoke privilege if any */
+ if (geteuid() == 0) {
+ setgroups(1, &gid);
+ setgid(SKKSERV_GID);
+ setuid(SKKSERV_UID);
+ }
+#endif
pgmnm = argv[0];
debug = 0;
errout = stderr;
@@ -200,7 +215,10 @@ char *argv[];
fclose(stderr);
/* detach child process from control terminal */
-#ifdef HAVE_TIOCNOTTY
+#ifdef HAVE_SETSID
+ setsid();
+#else
+#ifdef TIOCNOTTY
if ((ctlterm = open("/dev/tty", 2)) >= 0) {
ioctl(ctlterm, TIOCNOTTY, 0);
close(ctlterm);
@@ -215,6 +233,7 @@ char *argv[];
signal(SIGHUP, SIG_IGN);
if (fork() != 0) exit(0);
#endif
+#endif
} else { /* debug mode */
fprintf(errout, "SKK-JISYO is %s\n", jname);
fflush(errout);
@@ -222,7 +241,7 @@ char *argv[];
if (errout != stderr) fclose(stderr);
}
- signal(SIGINT, reread);
+ signal(SIGINT, req_reread);
/* 1993/6/5 by kam, re-read dictionary by "INT" signal */
nclients = 0;
@@ -244,8 +263,11 @@ showusage()
mksock()
{
struct sockaddr_in sin;
+#ifdef PF_INET6
+ struct sockaddr_in6 sin6;
+#endif
struct servent *sp;
- int optbuf = 1; /* enable socket REUSEADDR */
+ int optbuf; /* enable socket REUSEADDR */
bzero((char*)&sin, sizeof(sin));
sin.sin_family = AF_INET;
@@ -262,16 +284,54 @@ mksock()
sin.sin_port = htons(portnum);
if ((initsock = socket(PF_INET, SOCK_STREAM, 0)) < 0)
- err("socket error; socket cannot be created");
- if (setsockopt(initsock, SOL_SOCKET, SO_REUSEADDR,
+ warn("socket error; socket cannot be created");
+#ifdef PF_INET6
+ bzero((char*)&sin6, sizeof(sin6));
+ sin6.sin6_family = AF_INET6;
+ /* sin6.sin6_addr.s6_addr = IN6ADDR_ANY_INIT; ... all-zero pattern */
+ sin6.sin6_port = htons(portnum);
+ if ((initsock6 = socket(PF_INET6, SOCK_STREAM, 0)) < 0)
+ warn("socket error; IPv6 socket cannot be created");
+#endif
+ optbuf = 1;
+ if (initsock >= 0 && setsockopt(initsock, SOL_SOCKET, SO_REUSEADDR,
+ &optbuf, sizeof(optbuf)) < 0)
+ warn("socket error; cannot set socket option");
+#ifdef PF_INET6
+ optbuf = 1;
+ if (initsock6 >= 0 && setsockopt(initsock6, SOL_SOCKET, SO_REUSEADDR,
&optbuf, sizeof(optbuf)) < 0)
- err("socket error; cannot set socket option");
- if (bind(initsock, (struct sockaddr *)&sin, sizeof(sin))< 0)
- err("bind error; the socket is already used");
- if (listen(initsock, MAXQUE) < 0)
+ warn("socket error; cannot set socket option");
+#endif
+ if (initsock >= 0 && bind(initsock, (struct sockaddr *)&sin, sizeof(sin))< 0) {
+ warn("bind error; the socket is already used");
+ close(initsock);
+ initsock = -1;
+ }
+#ifdef PF_INET6
+ if (initsock6 >= 0 && bind(initsock6, (struct sockaddr *)&sin6, sizeof(sin6))< 0) {
+ warn("bind error; the socket is already used");
+ close(initsock6);
+ initsock6 = -1;
+ }
+#endif
+ if (initsock < 0
+#ifdef PF_INET6
+ && initsock6 < 0
+#endif
+ )
+ exit(1);
+ if (initsock >= 0 && listen(initsock, MAXQUE) < 0)
err("listen error; something wrong happened with the socket");
+#ifdef PF_INET6
+ if (initsock6 >= 0 && listen(initsock6, MAXQUE) < 0)
+ err("listen error; something wrong happened with the IPv6 socket");
+#endif
if (debug) {
fprintf(errout, "file descriptor for initsock is %d\n", initsock);
+#ifdef PF_INET6
+ fprintf(errout, "file descriptor for initsock6 is %d\n", initsock6);
+#endif
fflush(errout);
}
}
@@ -303,8 +363,19 @@ mkjtab()
mkoldjtab(buf);
}
+/* using stdio in signal handler is unsafe */
+#ifdef __STDC__
+volatile
+#endif
+int reread_requested;
+
+RETSIGTYPE req_reread()
+{
+ reread_requested = 1;
+}
+
/* 1993/6/5 by kam, re-read dictionary by "INT" signal */
-RETSIGTYPE reread()
+void reread()
{
if (fclose(jisho) < 0) {
fprintf(stderr,
@@ -455,15 +526,22 @@ mknewjtab()
main_loop()
{
fd_set readfds, writefds, exceptfds;
- fd_set getrfds();
+ void getrfds();
struct sockaddr_in from;
+#ifdef PF_INET6
+ struct sockaddr_in6 from6;
+#endif
int len;
register int i;
FD_ZERO(&writefds);
FD_ZERO(&exceptfds);
for(;;) { /* infinite loop; waiting for client's request */
- readfds = getrfds();
+ if (reread_requested) {
+ reread();
+ reread_requested = 0;
+ }
+ getrfds(&readfds);
if (select(MAXDTAB, &readfds, &writefds, &exceptfds, NULL) < 0) {
if (errno == EINTR) /* if signal happens */
continue;
@@ -474,16 +552,32 @@ main_loop()
fflush(errout);
}
- if (FD_ISSET(initsock, &readfds)) {
+ if (initsock >= 0 && FD_ISSET(initsock, &readfds)) {
len = sizeof(from);
if ((clientsock[nclients ++] = accept(initsock, &from, &len)) < 0) {
err("accept error; something wrong happened with the socket");
}
- if (nclients >= MAXDTAB - 3 - debug * 2) {
+ if (nclients >= MAXDTAB - 3
+#ifdef PF_INET6
+ -1
+#endif
+ - debug * 2) {
write(clientsock[--nclients], SERVER_FULL, 1);
close(clientsock[nclients]);
}
}
+#ifdef PF_INET6
+ if (initsock6 >= 0 && FD_ISSET(initsock6, &readfds)) {
+ len = sizeof(from6);
+ if ((clientsock[nclients ++] = accept(initsock6, &from6, &len)) < 0) {
+ err("accept error; something wrong happened with the socket");
+ }
+ if (nclients >= MAXDTAB - 4 - debug * 2) {
+ write(clientsock[--nclients], SERVER_FULL, 1);
+ close(clientsock[nclients]);
+ }
+ }
+#endif
/* naiive scheduling */
for (i = 0; i < nclients; i ++)
@@ -511,16 +605,20 @@ main_loop()
* get bit pattern of read file descriptor
*/
-fd_set getrfds()
+void getrfds(rfds)
+fd_set *rfds;
{
- fd_set rfds;
register int i;
- FD_ZERO(&rfds);
- FD_SET(initsock, &rfds);
+ FD_ZERO(rfds);
+ if (initsock >= 0)
+ FD_SET(initsock, rfds);
+#ifdef PF_INET6
+ if (initsock6 >= 0)
+ FD_SET(initsock6, rfds);
+#endif
for (i = 0; i < nclients; i ++)
- FD_SET(clientsock[i], &rfds);
- return (rfds);
+ FD_SET(clientsock[i], rfds);
}
/*
@@ -724,6 +822,9 @@ set_hname()
exit(1);
}
hentry = gethostbyname(hname);
+ if (hentry == NULL) {
+ fprintf(errout, "%s: WARNING: gethostbyname(%s) failed\n", pgmnm, hname);
+ } else {
#ifdef NO_ADDR_LIST
strcat(hname, ":");
strcat(hname, hentry->h_addr);
@@ -736,6 +837,7 @@ set_hname()
strcat(hname, inet_ntoa(*(struct in_addr *)*p++));
}
#endif
+ }
strcat(hname, ": ");
}
|
