Attachment 701013 Details for Bug 913807 – Patch to correct readServices return code and check

[patch] Patch to correct readServices return code and check

chkconfig-1.3.49.3-nullchk.patch (text/plain), 1.51 KB, created by Brad Hubbard on 2013-02-22 06:47:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Hubbard

Created: 2013-02-22 06:47:52 UTC

Size: 1.51 KB

patch

obsolete

>diff -up chkconfig-1.3.49.3/chkconfig.c.nullchk chkconfig-1.3.49.3/chkconfig.c
>--- chkconfig-1.3.49.3/chkconfig.c.nullchk	2012-02-01 21:23:09.000000000 +0000
>+++ chkconfig-1.3.49.3/chkconfig.c	2013-01-29 16:01:12.093271972 +0000
>@@ -84,6 +84,8 @@ static int delService(char *name, int ty
> 
>     if (LSB && level == -1) {
> 	numservs = readServices(&services);
>+	if (numservs < 0)
>+	    return 1;
> 
> 	for (i = 0; i < numservs ; i++) {
> 		if (services[i].startDeps) {
>@@ -236,6 +238,8 @@ static int frobDependencies(struct servi
> 	int i;
> 
> 	numservs = readServices(&servs);
>+	if (numservs < 0)
>+	    return 1;
>         /* In the full service list, replace the target script's current
>            runlevels with the desired output runlevels, which are passed in */
> 	for (i = 0; i < numservs; i++) {
>@@ -453,6 +457,8 @@ static int listService(char * item, int 
> 
>     if (type & TYPE_INIT_D) {
>         numServices = readServices(&services);
>+	if (numServices < 0)
>+	    return 1;
>     
>         qsort(services, numServices, sizeof(*services), serviceNameCmp);
> 	
>diff -up chkconfig-1.3.49.3/leveldb.c.nullchk chkconfig-1.3.49.3/leveldb.c
>--- chkconfig-1.3.49.3/leveldb.c.nullchk	2013-01-29 15:52:10.484905054 +0000
>+++ chkconfig-1.3.49.3/leveldb.c	2013-01-29 15:52:18.113867923 +0000
>@@ -262,7 +262,7 @@ int readServices(struct service **servic
> 	if (!(dir = opendir(RUNLEVELS "/init.d"))) {
> 		fprintf(stderr, _("failed to open %s/init.d: %s\n"), RUNLEVELS,
> 			strerror(errno));
>-		return 1;
>+		return -1;
> 	}
> 
> 	while ((ent = readdir(dir))) {

Actions: View | Diff

Attachments on bug 913807: 701011 | 701013