Index: head/usr.sbin/daemon/daemon.8 =================================================================== --- head/usr.sbin/daemon/daemon.8 (revision 167699) +++ head/usr.sbin/daemon/daemon.8 (revision 167700) @@ -1,98 +1,95 @@ .\" Copyright (c) 1999 Berkeley Software Design, Inc. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. Berkeley Software Design Inc's name may not be used to endorse or .\" promote products derived from this software without specific prior .\" written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN INC BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" $FreeBSD$ .\" -.Dd March 9, 2007 +.Dd March 19, 2007 .Dt DAEMON 8 .Os .Sh NAME .Nm daemon .Nd run detached from the controlling terminal .Sh SYNOPSIS .Nm .Op Fl cf -.Op Fl u Ar user -.Op Fl g Ar group .Op Fl p Ar pidfile +.Op Fl u Ar user .Ar command arguments ... .Sh DESCRIPTION The .Nm utility detaches itself from the controlling terminal and executes the program specified by its arguments. -Privileges may be lowered to specified user and/or group. +Privileges may be lowered to the specified user. .Pp The options are as follows: .Bl -tag -width indent .It Fl c Change the current working directory to the root .Pq Dq Pa / . .It Fl f Redirect standard input, standard output and standard error to .Pa /dev/null . -.It Fl g Ar group -Drop privileges to specified group. .It Fl p Ar file Write the ID of the created process into the .Ar file -using -.It Fl u Ar user -Drop privileges to specified user. +using the .Xr pidfile 3 functionality. Note, that the file will be created shortly before the process is actually executed, and will remain after the process exits (although it will be removed if the execution fails). +.It Fl u Ar user +Run the program with the rights of user specified, requires privilege. .El .Sh EXIT STATUS The .Nm utility exits 1 if an error is returned by the .Xr daemon 3 library routine, 2 if the .Ar pidfile is requested, but cannot be opened, 3 if process is already running (pidfile exists and is locked), otherwise 0. .Sh DIAGNOSTICS If the command cannot be executed, an error message is displayed on standard error unless the .Fl f flag is specified. .Sh SEE ALSO .Xr setregid 2 , .Xr setreuid 2 , .Xr daemon 3 , .Xr exec 3 , .Xr pidfile 3 , .Xr termios 4 , .Xr tty 4 .Sh HISTORY The .Nm utility first appeared in .Fx 4.7 . Index: head/usr.sbin/daemon/daemon.c =================================================================== --- head/usr.sbin/daemon/daemon.c (revision 167699) +++ head/usr.sbin/daemon/daemon.c (revision 167700) @@ -1,159 +1,141 @@ /*- * Copyright (c) 1999 Berkeley Software Design, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Berkeley Software Design Inc's name may not be used to endorse or * promote products derived from this software without specific prior * written permission. * * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN INC BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * From BSDI: daemon.c,v 1.2 1996/08/15 01:11:09 jch Exp */ #include __FBSDID("$FreeBSD$"); #include #include #include #include -#include #include +#include #include #include #include -static void restrict_process(const char *, const char *); +static void restrict_process(const char *); static void usage(void); int main(int argc, char *argv[]) { struct pidfh *pfh = NULL; int ch, nochdir, noclose, errcode; - const char *pidfile, *user, *group; + const char *pidfile, *user; pid_t otherpid; nochdir = noclose = 1; - pidfile = user = group = NULL; - while ((ch = getopt(argc, argv, "-cfg:p:u:")) != -1) { + pidfile = user = NULL; + while ((ch = getopt(argc, argv, "-cf:p:u:")) != -1) { switch (ch) { case 'c': nochdir = 0; break; case 'f': noclose = 0; break; - case 'u': - user = optarg; - break; - case 'g': - group = optarg; - break; case 'p': pidfile = optarg; break; + case 'u': + user = optarg; + break; default: usage(); } } argc -= optind; argv += optind; if (argc == 0) usage(); - if (user || group) { - if (getuid() != 0) - errx(1, "only root user is allowed to chroot " - "and change UID/GID"); - restrict_process(user, group); - } + if (user != NULL) + restrict_process(user); /* * Try to open the pidfile before calling daemon(3), * to be able to report the error intelligently */ if (pidfile) { pfh = pidfile_open(pidfile, 0600, &otherpid); if (pfh == NULL) { if (errno == EEXIST) { errx(3, "process already running, pid: %d", otherpid); } err(2, "pidfile ``%s''", pidfile); } } if (daemon(nochdir, noclose) == -1) err(1, NULL); /* Now that we are the child, write out the pid */ if (pidfile) pidfile_write(pfh); execvp(argv[0], argv); /* * execvp() failed -- unlink pidfile if any, and * report the error */ errcode = errno; /* Preserve errcode -- unlink may reset it */ if (pidfile) pidfile_remove(pfh); /* The child is now running, so the exit status doesn't matter. */ errc(1, errcode, "%s", argv[0]); } static void -restrict_process(const char *user, const char *group) +restrict_process(const char *user) { - struct group *gr = NULL; struct passwd *pw = NULL; - errno = 0; - if (group != NULL) { - if (initgroups(user, gr->gr_gid) == -1) - errx(1, "User not in group list"); - if ((gr = getgrnam(group)) == NULL) - errx(1, "Group %s does not exist", group); - if (setgid(gr->gr_gid) == -1) - err(1, "%s", group); - } + pw = getpwnam(user); + if (pw == NULL) + errx(1, "unknown user: %s", user); - if (user != NULL) { - if ((pw = getpwnam(user)) == NULL) - errx(1, "User %s does not exist", user); - if (setuid(pw->pw_uid) == -1) - err(1, "%s", user); - } + if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) != 0) + errx(1, "failed to set user environment"); } static void usage(void) { (void)fprintf(stderr, - "usage: daemon [-cf] [-g group] [-p pidfile] [-u user] command " + "usage: daemon [-cf] [-p pidfile] [-u user] command " "arguments ...\n"); exit(1); }