Give an error when running zap as a generic user.

This commit is contained in:
Roy Marples 2008-04-08 22:57:42 +00:00
parent 034b9b7a12
commit 8759735711
2 changed files with 7 additions and 3 deletions

View File

@ -501,7 +501,7 @@ bool rc_service_mark(const char *service, const RC_SERVICE state)
base = basename_c(service);
if (state != RC_SERVICE_STOPPED) {
if (! exists(init)) {
if (!exists(init)) {
free(init);
return false;
}
@ -547,7 +547,10 @@ bool rc_service_mark(const char *service, const RC_SERVICE state)
symlink(init, was);
skip_wasinactive = true;
}
unlink(file);
if (unlink(file) == -1) {
free(init);
return false;
}
}
}
}

View File

@ -1306,7 +1306,8 @@ int runscript(int argc, char **argv)
}
} else if (strcmp(optarg, "zap") == 0) {
einfo("Manually resetting %s to stopped state", applet);
rc_service_mark(applet, RC_SERVICE_STOPPED);
if (!rc_service_mark(applet, RC_SERVICE_STOPPED))
eerrorx("rc_service_mark: %s", strerror(errno));
uncoldplug();
} else
svc_exec(optarg, NULL);