emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow --user and --group to also mean --chuid and --chgrp

Browse Source
This commit is contained in:
Roy Marples 2007-08-17 10:54:04 +00:00
parent e0a29e41a2
commit d1a1e3a3c9
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/start-stop-daemon.c
View File

@ -494,6 +494,7 @@ int start_stop_daemon (int argc, char **argv)
{ "stderr", 1, NULL, '2'}, { "stderr", 1, NULL, '2'},
{ NULL, 0, NULL, 0} { NULL, 0, NULL, 0}
}; };
int opt; int opt;
bool start = false; bool start = false;
bool stop = false; bool stop = false;
@ -505,12 +506,11 @@ int start_stop_daemon (int argc, char **argv)
char *cmd = NULL; char *cmd = NULL;
char *pidfile = NULL; char *pidfile = NULL;
int sig = SIGTERM; int sig = SIGTERM;
uid_t uid = 0;
int nicelevel = 0; int nicelevel = 0;
bool background = false; bool background = false;
bool makepidfile = false; bool makepidfile = false;
uid_t ch_uid = 0; uid_t uid = 0;
gid_t ch_gid = 0; gid_t gid = 0;
char *ch_root = NULL; char *ch_root = NULL;
char *ch_dir = NULL; char *ch_dir = NULL;
int tid = 0; int tid = 0;
@ -573,9 +573,9 @@ int start_stop_daemon (int argc, char **argv)
if (! pw) if (! pw)
eerrorx ("%s: user `%s' not found", progname, cu); eerrorx ("%s: user `%s' not found", progname, cu);
ch_uid = pw->pw_uid; uid = pw->pw_uid;
if (! ch_gid) if (! gid)
ch_gid = pw->pw_gid; gid = pw->pw_gid;
if (p) { if (p) {
struct group *gr = NULL; struct group *gr = NULL;
@ -588,7 +588,7 @@ int start_stop_daemon (int argc, char **argv)
if (! gr) if (! gr)
eerrorx ("%s: group `%s' not found", progname, cg); eerrorx ("%s: group `%s' not found", progname, cg);
ch_gid = gr->gr_gid; gid = gr->gr_gid;
} }
} }
break; break;
@ -608,7 +608,7 @@ int start_stop_daemon (int argc, char **argv)
if (! gr) if (! gr)
eerrorx ("%s: group `%s' not found", progname, optarg); eerrorx ("%s: group `%s' not found", progname, optarg);
ch_gid = gr->gr_gid; gid = gr->gr_gid;
} }
break; break;
@ -767,10 +767,10 @@ int start_stop_daemon (int argc, char **argv)
printf("%s ", *argv++); printf("%s ", *argv++);
printf ("\n"); printf ("\n");
eindent (); eindent ();
if (ch_uid != 0) if (uid != 0)
einfo ("as user %d", ch_uid); einfo ("as user id %d", uid);
if (ch_gid != 0) if (gid != 0)
einfo ("as group %d", ch_gid); einfo ("as group id %d", gid);
if (ch_root) if (ch_root)
einfo ("in root `%s'", ch_root); einfo ("in root `%s'", ch_root);
if (ch_dir) if (ch_dir)
@ -844,14 +844,14 @@ int start_stop_daemon (int argc, char **argv)
eerrorx ("%s: pam error: %s", progname, pam_strerror(pamh, pamr)); eerrorx ("%s: pam error: %s", progname, pam_strerror(pamh, pamr));
#endif #endif
if (ch_gid && setgid (ch_gid)) if (gid && setgid (gid))
eerrorx ("%s: unable to set groupid to %d", progname, ch_gid); eerrorx ("%s: unable to set groupid to %d", progname, gid);
if (changeuser && initgroups (changeuser, ch_gid)) if (changeuser && initgroups (changeuser, gid))
eerrorx ("%s: initgroups (%s, %d)", progname, changeuser, ch_gid); eerrorx ("%s: initgroups (%s, %d)", progname, changeuser, gid);
if (ch_uid && setuid (ch_uid)) if (uid && setuid (uid))
eerrorx ("%s: unable to set userid to %d", progname, ch_uid); eerrorx ("%s: unable to set userid to %d", progname, uid);
else { else {
struct passwd *passwd = getpwuid (ch_uid); struct passwd *passwd = getpwuid (uid);
if (passwd) { if (passwd) {
unsetenv ("HOME"); unsetenv ("HOME");
if (passwd->pw_dir) if (passwd->pw_dir)