d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfsuserd.c: Replace slave with server

Browse Source
This commit is contained in:
Rick Macklem 2023-04-22 08:18:02 -07:00
parent 7f658f99f7
commit 33906122e1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/nfsuserd/nfsuserd.c
View File

@ -96,9 +96,9 @@ u_char *defaultuser = "nobody";
uid_t defaultuid = 65534; uid_t defaultuid = 65534;
u_char *defaultgroup = "nogroup"; u_char *defaultgroup = "nogroup";
gid_t defaultgid = 65533; gid_t defaultgid = 65533;
int verbose = 0, im_a_slave = 0, nfsuserdcnt = -1, forcestart = 0; int verbose = 0, im_a_server = 0, nfsuserdcnt = -1, forcestart = 0;
int defusertimeout = DEFUSERTIMEOUT, manage_gids = 0; int defusertimeout = DEFUSERTIMEOUT, manage_gids = 0;
pid_t slaves[MAXNFSUSERD]; pid_t servers[MAXNFSUSERD];
static struct sockaddr_storage fromip; static struct sockaddr_storage fromip;
#ifdef INET6 #ifdef INET6
static struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; static struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT;
@ -290,7 +290,7 @@ main(int argc, char *argv[])
dnsname, nid.nid_usermax, nid.nid_usertimeout); dnsname, nid.nid_usermax, nid.nid_usertimeout);
for (i = 0; i < nfsuserdcnt; i++) for (i = 0; i < nfsuserdcnt; i++)
slaves[i] = (pid_t)-1; servers[i] = (pid_t)-1;
nargs.nuserd_family = fromip.ss_family; nargs.nuserd_family = fromip.ss_family;
/* /*
@ -444,7 +444,7 @@ main(int argc, char *argv[])
exit(0); exit(0);
#endif #endif
/* /*
* Temporarily block SIGUSR1 and SIGCHLD, so slaves[] can't * Temporarily block SIGUSR1 and SIGCHLD, so servers[] can't
* end up bogus. * end up bogus.
*/ */
sigemptyset(&signew); sigemptyset(&signew);
@ -463,14 +463,14 @@ main(int argc, char *argv[])
openlog("nfsuserd:", LOG_PID, LOG_DAEMON); openlog("nfsuserd:", LOG_PID, LOG_DAEMON);
/* /*
* Fork off the slave daemons that do the work. All the master * Fork off the server daemons that do the work. All the master
* does is kill them off and cleanup. * does is terminate them and cleanup.
*/ */
for (i = 0; i < nfsuserdcnt; i++) { for (i = 0; i < nfsuserdcnt; i++) {
slaves[i] = fork(); servers[i] = fork();
if (slaves[i] == 0) { if (servers[i] == 0) {
im_a_slave = 1; im_a_server = 1;
setproctitle("slave"); setproctitle("server");
sigemptyset(&signew); sigemptyset(&signew);
sigaddset(&signew, SIGUSR1); sigaddset(&signew, SIGUSR1);
sigprocmask(SIG_UNBLOCK, &signew, NULL); sigprocmask(SIG_UNBLOCK, &signew, NULL);
@ -481,7 +481,7 @@ main(int argc, char *argv[])
svc_run(); svc_run();
syslog(LOG_ERR, "nfsuserd died: %m"); syslog(LOG_ERR, "nfsuserd died: %m");
exit(1); exit(1);
} else if (slaves[i] < 0) { } else if (servers[i] < 0) {
syslog(LOG_ERR, "fork: %m"); syslog(LOG_ERR, "fork: %m");
} }
} }
@ -800,7 +800,7 @@ cleanup_term(int signo __unused)
{ {
int i, cnt; int i, cnt;
if (im_a_slave) if (im_a_server)
exit(0); exit(0);
/* /*
@ -809,9 +809,9 @@ cleanup_term(int signo __unused)
*/ */
cnt = 0; cnt = 0;
for (i = 0; i < nfsuserdcnt; i++) { for (i = 0; i < nfsuserdcnt; i++) {
if (slaves[i] != (pid_t)-1) { if (servers[i] != (pid_t)-1) {
cnt++; cnt++;
kill(slaves[i], SIGUSR1); kill(servers[i], SIGUSR1);
} }
} }