1 --- chkconfig-1.3.63/chkconfig.8 2014-11-05 18:39:09.000000000 +0200
2 +++ chkconfig-1.3.63.no-xinetd/chkconfig.8 2014-11-30 14:54:29.771983174 +0200
4 an already-started service, and will not re-stop a service that is
7 -\fBchkconfig\fR also can manage xinetd scripts via the means
8 -of xinetd.d configuration files. Note that only the
9 -\fBon\fR, \fBoff\fR, and \fB-\-list\fR commands are supported
10 -for xinetd.d services.
12 -\fBchkconfig\fR supports a \fB-\-type\fR argument to limit actions to only
13 -a specific type of services, in the case where services of either type may
14 -share a name. Possible values for \fItype\fR are \fIsysv\fR
19 \fB-\-level \fIlevels\fR
20 --- chkconfig-1.3.63/chkconfig.c 2014-11-30 14:57:06.299908151 +0200
21 +++ chkconfig-1.3.63.no-xinetd/chkconfig.c 2014-11-30 14:55:40.542232924 +0200
23 readServiceError(rc, name);
26 - if (s.type == TYPE_XINETD) return 0;
34 - if (s.type == TYPE_XINETD) return 0;
42 - if (s.type == TYPE_XINETD) return 0;
46 if ((s.levels == o.levels) &&
50 printf("%-15s", s.name);
51 - if (s.type == TYPE_XINETD) {
52 - printf("\t%s\n", s.levels ? _("on") : _("off"));
56 for (i = 0; i < 7; i++) {
57 printf("\t%d:%s", i, isOn(s.name, i) ? _("on") : _("off"));
59 return showServiceInfo(s, forgiving);
63 -static int isXinetdEnabled() {
66 - if (isOverriddenBySystemd("xinetd") && isEnabledInSystemd("xinetd"))
69 - if (readServiceInfo("xinetd", TYPE_INIT_D, &s, 0)) {
72 - if (s.currentLevels)
77 static int serviceNameCmp(const void * a, const void * b) {
78 return strcmp(* (char **)a, * (char **)b);
81 -static int xinetdNameCmp(const void * a, const void * b) {
82 - const struct service * first = a;
83 - const struct service * second = b;
85 - return strcmp(first->name, second->name);
89 static int listService(char * item, int type) {
97 - if (isXinetdEnabled() && type & TYPE_XINETD) {
98 - struct service *s, *t;
101 - printf(_("xinetd based services:\n"));
102 - if (!(dir = opendir(XINETDDIR))) {
103 - fprintf(stderr, _("failed to open directory %s: %s\n"),
104 - XINETDDIR, strerror(err));
108 - numServicesAlloced = 10;
109 - s = malloc(sizeof (*s) * numServicesAlloced);
111 - while ((ent = readdir(dir))) {
114 - /* Skip any file starting with a . */
115 - if (ent->d_name[0] == '.') continue;
117 - /* Skip files with known bad extensions */
118 - if ((dn = strrchr(ent->d_name, '.')) != NULL &&
119 - (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp")))
122 - dn = ent->d_name + strlen(ent->d_name) - 1;
123 - if (*dn == '~' || *dn == ',')
126 - if (numServices == numServicesAlloced) {
127 - numServicesAlloced += 10;
128 - s = realloc(s, numServicesAlloced * sizeof (*s));
130 - if (readXinetdServiceInfo(ent->d_name, s + numServices) != -1)
134 - qsort(s, numServices, sizeof(*s), xinetdNameCmp);
136 - for (i = 0; i < numServices; i++, s++) {
137 - char *tmp = malloc(strlen(s->name) + 5);
138 - sprintf(tmp,"%s:",s->name);
139 - printf("\t%-15s\t%s\n", tmp, s->levels ? _("on") : _("off"));
151 - } else if (s.type == TYPE_XINETD) {
152 - if (setXinetdService(s, state)) {
155 - system("/sbin/service xinetd reload >/dev/null 2>&1");
161 void forwardSystemd(const char *name, int type, const char *verb) {
163 - if (type == TYPE_XINETD)
166 if (!systemdIsInit())
168 @@ -704,12 +618,10 @@
169 if (help) usage(progname);
172 - if (!strcmp(typeString, "xinetd"))
173 - type = TYPE_XINETD;
174 - else if (!strcmp(typeString, "sysv"))
175 + if (!strcmp(typeString, "sysv"))
178 - fprintf(stderr, _("--type must be 'sysv' or 'xinetd'\n"));
179 + fprintf(stderr, _("--type must be 'sysv'\n"));
184 rc = readServiceInfo(name, type, &s, 0);
187 - if (s.type == TYPE_XINETD) {
188 - if (isOn("xinetd",level))
194 level = currentRunlevel();
195 return s.currentLevels & (1 << level) ? 0 : 1;
197 } else if (!strcmp(state, "on")) {
198 if (!noRedirectItem) {
199 forwardSystemd(name, type, "enable");
200 --- chkconfig-1.3.63/leveldb.c 2014-11-30 14:57:06.299908151 +0200
201 +++ chkconfig-1.3.63.no-xinetd/leveldb.c 2014-11-30 14:56:00.846594263 +0200
202 @@ -154,107 +154,6 @@
206 -int readXinetdServiceInfo(char *name, struct service * service) {
209 - struct service serv = {
217 - softStartDeps: NULL,
218 - softStopDeps: NULL,
225 - char * buf = NULL, *ptr;
226 - char * eng_desc = NULL, *start;
228 - asprintf(&filename, XINETDDIR "/%s", name);
230 - if ((fd = open(filename, O_RDONLY)) < 0) goto out_err;
232 - if (! S_ISREG(sb.st_mode)) goto out_err;
233 - buf = malloc(sb.st_size+1);
234 - if (read(fd,buf,sb.st_size)!=sb.st_size) goto out_err;
236 - serv.name = strdup(name);
237 - buf[sb.st_size] = '\0';
240 - ptr = strchr(buf,'\n');
243 - while (isspace(*buf) && buf < ptr) buf++;
244 - if (!strncmp(buf,"default:", 9)) {
246 - while(isspace(*buf)) buf++;
247 - if (!strncmp(buf+9,"on",2)) {
252 - } else if (!strncmp(buf,"description:",12)) {
254 - if (readDescription(buf,start+sb.st_size,
255 - &serv.desc,&eng_desc)) {
256 - if (serv.desc) free(serv.desc);
260 - serv.desc = eng_desc;
262 - serv.desc = strdup(name);
263 - } else if (eng_desc)
273 - while (isspace(*buf) && buf < ptr) buf++;
274 - if (!strncmp(buf,"disable", 7)) {
275 - buf = strstr(buf,"=");
279 - } while(isspace(*buf));
281 - if (buf && strncmp(buf,"yes",3)) {
282 - serv.levels = parseLevels("0123456",0);
283 - if (serv.enabled == -1)
287 - if (serv.enabled == -1)
307 int readServices(struct service **services) {
310 @@ -304,12 +203,14 @@
313 if (!(type & TYPE_INIT_D))
317 asprintf(&filename, RUNLEVELS "/init.d/%s", name);
319 - if ((fd = open(filename, O_RDONLY)) < 0)
321 + if ((fd = open(filename, O_RDONLY)) < 0) {
327 parseret = parseServiceInfo(fd, name, &serv, honorHide, 0);
335 - if (!(type & TYPE_XINETD))
337 - return readXinetdServiceInfo(name,service);
340 int readServiceDifferences(char * name, int type, struct service * service, struct service * service_overrides, int honorHide) {
341 @@ -353,12 +248,13 @@
344 if (!(type & TYPE_INIT_D))
348 asprintf(&filename, RUNLEVELS "/init.d/%s", name);
350 if ((fd = open(filename, O_RDONLY)) < 0) {
359 *service_overrides = serv_overrides;
364 - if (!(type & TYPE_XINETD))
366 - return readXinetdServiceInfo(name,service);
369 static struct dep *parseDeps(char *pos, char *end) {
374 -int setXinetdService(struct service s, int on) {
376 - char oldfname[100], newfname[100];
378 - char *buf, *ptr, *tmp;
383 - on = s.enabled ? 1 : 0;
385 - snprintf(oldfname,100,"%s/%s",XINETDDIR,s.name);
386 - if ( (oldfd = open(oldfname,O_RDONLY)) == -1 ) {
390 - buf = malloc(sb.st_size+1);
391 - if (read(oldfd,buf,sb.st_size)!=sb.st_size) {
397 - buf[sb.st_size] = '\0';
398 - snprintf(newfname,100,"%s/%s.XXXXXX",XINETDDIR,s.name);
399 - mode = umask(S_IRWXG | S_IRWXO);
400 - newfd = mkstemp(newfname);
408 - ptr = strchr(buf,'\n');
413 - while (isspace(*buf)) buf++;
414 - if (strncmp(buf,"disable", 7) && strlen(buf)) {
415 - write(newfd,tmp,strlen(tmp));
416 - write(newfd,"\n",1);
417 - if (buf[0] == '{') {
418 - snprintf(tmpstr,50,"\tdisable\t= %s", on ? "no" : "yes");
419 - write(newfd,tmpstr,strlen(tmpstr));
420 - write(newfd,"\n",1);
427 - return(rename(newfname,oldfname));
430 int doSetService(struct service s, int level, int on) {
431 int priority = on ? s.sPriority : s.kPriority;
433 --- chkconfig-1.3.63/leveldb.h 2014-11-05 18:39:09.000000000 +0200
434 +++ chkconfig-1.3.63.no-xinetd/leveldb.h 2014-11-30 14:54:29.775316676 +0200
438 #define RUNLEVELS "/etc"
439 -#define XINETDDIR "/etc/xinetd.d"
443 #define TYPE_INIT_D 0x1
444 -#define TYPE_XINETD 0x2
445 -#define TYPE_ANY (TYPE_INIT_D | TYPE_XINETD)
446 +#define TYPE_ANY (TYPE_INIT_D)
448 #ifndef SYSTEMD_SERVICE_PATH
449 #define SYSTEMD_SERVICE_PATH "/lib/systemd/system"
451 int whatLevels(char * name);
452 int doSetService(struct service s, int level, int on);
453 int findServiceEntries(char * name, int level, glob_t * globresptr);
454 -int readXinetdServiceInfo(char *name, struct service *service);
455 -int setXinetdService(struct service s, int on);
458 int isOverriddenBySystemd(const char *service);
459 --- chkconfig-1.3.63/ntsysv.c 2014-11-05 18:39:09.000000000 +0200
460 +++ chkconfig-1.3.63.no-xinetd/ntsysv.c 2014-11-30 14:54:29.775316676 +0200
462 states = alloca(sizeof(*states) * numServices);
464 for (i = 0; i < numServices; i++) {
465 - if (services[i].type == TYPE_XINETD) {
466 - checkboxes[i] = newtCheckbox(-1, i, services[i].name,
467 - services[i].levels ? '*' : ' ', NULL,
470 checkboxes[i] = newtCheckbox(-1, i, services[i].name,
471 (services[i].currentLevels & levels) ? '*' : ' ', NULL,
474 newtFormAddComponent(subform, checkboxes[i]);
477 @@ -126,16 +120,10 @@
478 if (!update) return 1;
480 for (i = 0; i < numServices; i++) {
481 - if (services[i].type == TYPE_XINETD) {
482 - if ((services[i].enabled && states[i] != '*') ||
483 - (!services[i].enabled && states[i] == '*'))
484 - setXinetdService(services[i], states[i] == '*');
486 for (j = 0; j < 7; j++) {
487 if (levels & (1 << j))
488 doSetService(services[i], j, states[i] == '*');
498 - if (!stat("/usr/sbin/xinetd",&sb)) {
499 - if (!(dir = opendir(XINETDDIR))) {
500 - fprintf(stderr, "failed to open " XINETDDIR ": %s\n",
505 - while ((ent = readdir(dir))) {
506 - if (strchr(ent->d_name, '~') || strchr(ent->d_name, ',') ||
507 - strchr(ent->d_name, '.')) continue;
509 - sprintf(fn, "%s/%s", XINETDDIR, ent->d_name);
515 - if (!S_ISREG(sb.st_mode)) continue;
517 - if (numServices == numServicesAlloced) {
518 - numServicesAlloced += 10;
519 - services = realloc(services,
520 - numServicesAlloced * sizeof(*services));
523 - rc = readXinetdServiceInfo(ent->d_name, services + numServices);
526 - fprintf(stderr, _("error reading info for service %s: %s\n"),
527 - ent->d_name, strerror(errno));
535 - fprintf(stderr, _("error reading from directory %s: %s\n"),
536 - XINETDDIR, strerror(err));
541 qsort(services, numServices, sizeof(*services), serviceNameCmp);
543 *servicesPtr = services;