X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fstatd.c;h=157de853bf5aa4fbab1d6cc655f40beb6b806bca;hp=f666bcd4cba4e1e61247e715d293e06fc281fd88;hb=3482b1145c2c9a39f1dcaabc32e36eb234b91447;hpb=af93e0306d87bba3f703386fd6390e9bf8e76816 diff --git a/utils/statd/statd.c b/utils/statd/statd.c index f666bcd..157de85 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -7,7 +7,11 @@ * NSM for Linux. */ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include +#endif + +#include #include #include #include @@ -19,9 +23,11 @@ #include #include #include +#include #include #include "statd.h" #include "version.h" +#include "nfslib.h" /* Socket operations */ #include @@ -39,14 +45,13 @@ char * SM_STAT_PATH = DEFAULT_SM_STAT_PATH; /* ----- end of state directory path stuff ------- */ -short int restart = 0; int run_mode = 0; /* foreground logging mode */ /* LH - I had these local to main, but it seemed silly to have * two copies of each - one in main(), one static in log.c... * It also eliminates the 256-char static in log.c */ char *name_p = NULL; -char *version_p = NULL; +const char *version_p = NULL; /* PRC: a high-availability callout program can be specified with -H * When this is done, the program will receive callouts whenever clients @@ -65,11 +70,12 @@ static struct option longopts[] = { "state-directory-path", 1, 0, 'P' }, { "notify-mode", 0, 0, 'N' }, { "ha-callout", 1, 0, 'H' }, + { "no-notify", 0, 0, 'L' }, { NULL, 0, 0, 0 } }; extern void sm_prog_1 (struct svc_req *, register SVCXPRT *); -extern int statd_get_socket(int port); +extern int statd_get_socket(void); #ifdef SIMULATIONS extern void simulator (int, char **); @@ -102,8 +108,7 @@ static void killer (int sig) { note (N_FATAL, "Caught signal %d, un-registering and exiting.", sig); - if (!(run_mode & MODE_NOTIFY_ONLY)) - pmap_unset (SM_PROG, SM_VERS); + pmap_unset (SM_PROG, SM_VERS); exit (0); } @@ -111,8 +116,10 @@ killer (int sig) static void sigusr (int sig) { - dprintf (N_DEBUG, "Caught signal %d, re-reading notify list.", sig); - re_notify = 1; + extern void my_svc_exit (void); + dprintf (N_DEBUG, "Caught signal %d, re-notifying (state %d).", sig, + MY_STATE); + my_svc_exit(); } /* @@ -132,16 +139,7 @@ static void log_modes(void) if (run_mode & MODE_LOG_STDERR) strcat(buf,"Log-STDERR "); - if (run_mode & MODE_NOTIFY_ONLY) - { - strcat(buf,"Notify-Only "); - } note(N_WARNING,buf); - /* future: IP aliasing - if (run_mode & MODE_NOTIFY_ONLY) - { - dprintf(N_DEBUG,"Notify IP: %s",svr_addr); - } */ } /* @@ -161,6 +159,7 @@ usage() fprintf(stderr," -n, --name Specify a local hostname.\n"); fprintf(stderr," -P State directory path.\n"); fprintf(stderr," -N Run in notify only mode.\n"); + fprintf(stderr," -L, --no-notify Do not perform any notification.\n"); fprintf(stderr," -H Specify a high-availability callout program.\n"); } @@ -193,8 +192,10 @@ static void drop_privs(void) struct stat st; if (stat(SM_DIR, &st) == -1 && - stat(DIR_BASE, &st) == -1) + stat(DIR_BASE, &st) == -1) { st.st_uid = 0; + st.st_gid = 0; + } if (st.st_uid == 0) { note(N_WARNING, "statd running as root. chown %s to choose different user\n", @@ -215,6 +216,31 @@ static void drop_privs(void) } } +static void run_sm_notify(int outport) +{ + char op[20]; + char *av[6]; + int ac = 0; + + av[ac++] = "/usr/sbin/sm-notify"; + if (run_mode & MODE_NODAEMON) + av[ac++] = "-d"; + if (outport) { + sprintf(op, "-p%d", outport); + av[ac++] = op; + } + if (run_mode & STATIC_HOSTNAME) { + av[ac++] = "-N"; + av[ac++] = MY_NAME; + } + av[ac] = NULL; + fprintf(stderr, "%s: -N deprecated, consider using /usr/sbin/sm-notify directly\n", + name_p); + execv(av[0], av); + fprintf(stderr, "%s: failed to run %s\n", name_p, av[0]); + exit(2); + +} /* * Entry routine/main loop. */ @@ -225,6 +251,7 @@ int main (int argc, char **argv) int arg; int port = 0, out_port = 0; struct rlimit rlim; + int once = 1; int pipefds[2] = { -1, -1}; char status; @@ -250,7 +277,7 @@ int main (int argc, char **argv) MY_NAME = NULL; /* Process command line switches */ - while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:", longopts, NULL)) != EOF) { + while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:L", longopts, NULL)) != EOF) { switch (arg) { case 'V': /* Version */ case 'v': @@ -262,6 +289,9 @@ int main (int argc, char **argv) case 'N': run_mode |= MODE_NOTIFY_ONLY; break; + case 'L': /* Listen only */ + run_mode |= MODE_NO_NOTIFY; + break; case 'd': /* No daemon only - log to stderr */ run_mode |= MODE_LOG_STDERR; break; @@ -284,6 +314,7 @@ int main (int argc, char **argv) } break; case 'n': /* Specify local hostname */ + run_mode |= STATIC_HOSTNAME; MY_NAME = xstrdup(optarg); break; case 'P': @@ -338,6 +369,10 @@ int main (int argc, char **argv) exit(-1); } + if (run_mode & MODE_NOTIFY_ONLY) + run_sm_notify(out_port); + + if (!(run_mode & MODE_NODAEMON)) { run_mode &= ~MODE_LOG_STDERR; /* Never log to console in daemon mode. */ @@ -365,7 +400,7 @@ int main (int argc, char **argv) #endif if (!(run_mode & MODE_NODAEMON)) { - int filedes, fdmax, tempfd; + int tempfd; if (pipe(pipefds)<0) { perror("statd: unable to create pipe"); @@ -399,14 +434,12 @@ int main (int argc, char **argv) } } tempfd = open("/dev/null", O_RDWR); - close(0); dup2(tempfd, 0); - close(1); dup2(tempfd, 1); - close(2); dup2(tempfd, 2); - fdmax = sysconf (_SC_OPEN_MAX); - for (filedes = 3; filedes < fdmax; filedes++) - if (filedes != pipefds[1]) - close (filedes); - + dup2(tempfd, 0); + dup2(tempfd, 1); + dup2(tempfd, 2); + dup2(pipefds[1], 3); + pipefds[1] = 3; + closeall(4); } /* Child. */ @@ -422,25 +455,29 @@ int main (int argc, char **argv) signal(SIGUSR1, sigusr); /* WARNING: the following works on Linux and SysV, but not BSD! */ signal(SIGCHLD, SIG_IGN); - - /* initialize out_port */ - statd_get_socket(out_port); + /* + * Ignore SIGPIPE to avoid statd dying when peers close their + * TCP connection while we're trying to reply to them. + */ + signal(SIGPIPE, SIG_IGN); create_pidfile(); atexit(truncate_pidfile); - drop_privs(); - for (;;) { - if (!(run_mode & MODE_NOTIFY_ONLY)) { - /* Do not do pmap_unset() when running in notify mode. - * We may clear the portmapper record for a statd not - * running in notify mode disabling it. - * Juan C. Gomez j_carlos_gomez@yahoo.com - */ - pmap_unset (SM_PROG, SM_VERS); + if (! (run_mode & MODE_NO_NOTIFY)) + switch (pid = fork()) { + case 0: + run_sm_notify(out_port); + break; + case -1: + break; + default: + waitpid(pid, NULL, 0); } - change_state (); - shuffle_dirs (); /* Move directory names around */ + + + for (;;) { + pmap_unset (SM_PROG, SM_VERS); /* If we got this far, we have successfully started, so notify parent */ if (pipefds[1] > 0) { @@ -450,22 +487,36 @@ int main (int argc, char **argv) pipefds[1] = -1; } - notify_hosts (); /* Send out notify requests */ - ++restart; - /* this registers both UDP and TCP services */ - if (!(run_mode & MODE_NOTIFY_ONLY)) { - rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port); - } + rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port); + if (once) { + once = 0; + drop_privs(); + } /* * Handle incoming requests: SM_NOTIFY socket requests, as * well as callbacks from lockd. */ my_svc_run(); /* I rolled my own, Olaf made it better... */ - if ((run_mode & MODE_NOTIFY_ONLY)) - break; + /* Only get here when simulating a crash so we should probably + * start sm-notify running again. As we have already dropped + * privileges, this might not work, but I don't think + * responding to SM_SIMU_CRASH is an important use cases to + * get perfect. + */ + if (! (run_mode & MODE_NO_NOTIFY)) + switch (pid = fork()) { + case 0: + run_sm_notify(out_port); + break; + case -1: + break; + default: + waitpid(pid, NULL, 0); + } + } return 0; }