Author: rpokala Date: Tue Dec 3 22:54:24 2019 New Revision: 355368 URL: https://svnweb.freebsd.org/changeset/base/355368
Log: MFC r355006: Add and document options to allow rpc.lockd and rpc.statd to run in the foreground. This allows a separate process to monitor when and how those programs exit. That process can then restart them if needed. Modified: stable/11/usr.sbin/rpc.lockd/lockd.c stable/11/usr.sbin/rpc.lockd/rpc.lockd.8 stable/11/usr.sbin/rpc.statd/rpc.statd.8 stable/11/usr.sbin/rpc.statd/statd.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/rpc.lockd/lockd.c ============================================================================== --- stable/11/usr.sbin/rpc.lockd/lockd.c Tue Dec 3 22:54:08 2019 (r355367) +++ stable/11/usr.sbin/rpc.lockd/lockd.c Tue Dec 3 22:54:24 2019 (r355368) @@ -118,6 +118,7 @@ main(int argc, char **argv) char *endptr, **hosts_bak; struct sigaction sigalarm; int grace_period = 30; + int foreground = 0; struct netconfig *nconf; int have_v6 = 1; int maxrec = RPC_MAXDATASIZE; @@ -125,7 +126,7 @@ main(int argc, char **argv) int attempt_cnt, port_len, port_pos, ret; char **port_list; - while ((ch = getopt(argc, argv, "d:g:h:p:")) != (-1)) { + while ((ch = getopt(argc, argv, "d:Fg:h:p:")) != (-1)) { switch (ch) { case 'd': debug_level = atoi(optarg); @@ -134,6 +135,9 @@ main(int argc, char **argv) /* NOTREACHED */ } break; + case 'F': + foreground = 1; + break; case 'g': grace_period = atoi(optarg); if (!grace_period) { @@ -420,7 +424,7 @@ main(int argc, char **argv) * Note that it is NOT sensible to run this program from inetd - the * protocol assumes that it will run immediately at boot time. */ - if (daemon(0, debug_level > 0)) { + if ((foreground == 0) && daemon(0, debug_level > 0)) { err(1, "cannot fork"); /* NOTREACHED */ } @@ -842,7 +846,7 @@ void usage() { errx(1, "usage: rpc.lockd [-d <debuglevel>]" - " [-g <grace period>] [-h <bindip>] [-p <port>]"); + " [-F] [-g <grace period>] [-h <bindip>] [-p <port>]"); } /* Modified: stable/11/usr.sbin/rpc.lockd/rpc.lockd.8 ============================================================================== --- stable/11/usr.sbin/rpc.lockd/rpc.lockd.8 Tue Dec 3 22:54:08 2019 (r355367) +++ stable/11/usr.sbin/rpc.lockd/rpc.lockd.8 Tue Dec 3 22:54:24 2019 (r355368) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 2, 2007 +.Dd November 21, 2019 .Dt RPC.LOCKD 8 .Os .Sh NAME @@ -38,6 +38,7 @@ .Sh SYNOPSIS .Nm .Op Fl d Ar debug_level +.Op Fl F .Op Fl g Ar grace period .Op Fl h Ar bindip .Op Fl p Ar port @@ -70,6 +71,17 @@ in the generation of one log line per protocol operati Higher debug levels can be specified, causing display of operation arguments and internal operations of the daemon. +.It Fl F +Run +.Nm +in the foreground, rather than going into daemon mode. +This is useful if some other process uses +.Xr fork 2 +and +.Xr exec 3 +to run +.Nm , +and wants to monitor when and how it exits. .It Fl g The .Fl g Modified: stable/11/usr.sbin/rpc.statd/rpc.statd.8 ============================================================================== --- stable/11/usr.sbin/rpc.statd/rpc.statd.8 Tue Dec 3 22:54:08 2019 (r355367) +++ stable/11/usr.sbin/rpc.statd/rpc.statd.8 Tue Dec 3 22:54:24 2019 (r355368) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 1, 2007 +.Dd November 21, 2019 .Dt RPC.STATD 8 .Os .Sh NAME @@ -38,6 +38,7 @@ .Sh SYNOPSIS .Nm .Op Fl d +.Op Fl F .Op Fl h Ar bindip .Op Fl p Ar port .Sh DESCRIPTION @@ -71,6 +72,17 @@ These messages are logged with level LOG_DEBUG and facility LOG_DAEMON. Error conditions are logged irrespective of this option, using level LOG_ERR. +.It Fl F +Run +.Nm +in the foreground, rather than going into daemon mode. +This is useful if some other process uses +.Xr fork 2 +and +.Xr exec 3 +to run +.Nm , +and wants to monitor when and how it exits. .It Fl h Ar bindip Specify specific IP addresses to bind to. This option may be specified multiple times. Modified: stable/11/usr.sbin/rpc.statd/statd.c ============================================================================== --- stable/11/usr.sbin/rpc.statd/statd.c Tue Dec 3 22:54:08 2019 (r355367) +++ stable/11/usr.sbin/rpc.statd/statd.c Tue Dec 3 22:54:24 2019 (r355368) @@ -86,15 +86,19 @@ main(int argc, char **argv) int ch, i, s; char *endptr, **hosts_bak; int have_v6 = 1; + int foreground = 0; int maxrec = RPC_MAXDATASIZE; int attempt_cnt, port_len, port_pos, ret; char **port_list; - while ((ch = getopt(argc, argv, "dh:p:")) != -1) + while ((ch = getopt(argc, argv, "dFh:p:")) != -1) switch (ch) { case 'd': debug = 1; break; + case 'F': + foreground = 1; + break; case 'h': ++nhosts; hosts_bak = hosts; @@ -285,7 +289,11 @@ main(int argc, char **argv) /* Note that it is NOT sensible to run this program from inetd - the */ /* protocol assumes that it will run immediately at boot time. */ - daemon(0, 0); + if ((foreground == 0) && daemon(0, 0) < 0) { + err(1, "cannot fork"); + /* NOTREACHED */ + } + openlog("rpc.statd", 0, LOG_DAEMON); if (debug) syslog(LOG_INFO, "Starting - debug enabled"); else syslog(LOG_INFO, "Starting"); @@ -615,7 +623,7 @@ clearout_service(void) static void usage(void) { - fprintf(stderr, "usage: rpc.statd [-d] [-h <bindip>] [-p <port>]\n"); + fprintf(stderr, "usage: rpc.statd [-d] [-F] [-h <bindip>] [-p <port>]\n"); exit(1); } _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"