X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fstatd.c;h=01fdb41301889bf6f36d6d68d5cc4d6b51673b33;hp=c92e12f29c3a72d1c4bb84a9f51b3c8f5e344e61;hb=9a5293a10551c03b4fb976503dd24da569fcadb3;hpb=93608a52655abf5ac23404c4b5cc05fe575a9c04 diff --git a/utils/statd/statd.c b/utils/statd/statd.c index c92e12f..01fdb41 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -23,35 +23,23 @@ #include #include #include +#include #include + #include "statd.h" -#include "version.h" #include "nfslib.h" +#include "nsm.h" /* Socket operations */ #include #include -/* Added to enable specification of state directory path at run-time - * j_carlos_gomez@yahoo.com - */ - -char * DIR_BASE = DEFAULT_DIR_BASE; - -char * SM_DIR = DEFAULT_SM_DIR; -char * SM_BAK_DIR = DEFAULT_SM_BAK_DIR; -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; -const char *version_p = NULL; +static char *name_p = NULL; /* PRC: a high-availability callout program can be specified with -H * When this is done, the program will receive callouts whenever clients @@ -70,11 +58,11 @@ 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); #ifdef SIMULATIONS extern void simulator (int, char **); @@ -88,8 +76,7 @@ static void sm_prog_1_wrapper (struct svc_req *rqstp, register SVCXPRT *transp) { /* remote host authorization check */ - if (!check_default("statd", svc_getcaller(transp), - rqstp->rq_proc, SM_PROG)) { + if (!check_default("statd", nfs_getrpccaller(transp), SM_PROG)) { svcerr_auth (transp, AUTH_FAILED); return; } @@ -100,25 +87,28 @@ sm_prog_1_wrapper (struct svc_req *rqstp, register SVCXPRT *transp) #define sm_prog_1 sm_prog_1_wrapper #endif +static void +statd_unregister(void) { + nfs_svc_unregister(SM_PROG, SM_VERS); +} + /* * Signal handler. */ 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); - - exit (0); + statd_unregister (); + xlog_err ("Caught signal %d, un-registering and exiting", sig); } static void sigusr (int sig) { - dprintf (N_DEBUG, "Caught signal %d, re-notifying (state %d).", sig, + extern void my_svc_exit (void); + xlog(D_GENERAL, "Caught signal %d, re-notifying (state %d)", sig, MY_STATE); - re_notify = 1; + my_svc_exit(); } /* @@ -137,17 +127,11 @@ static void log_modes(void) strcat(buf,"No-Daemon "); if (run_mode & MODE_LOG_STDERR) strcat(buf,"Log-STDERR "); +#ifdef HAVE_LIBTIRPC + strcat(buf, "TI-RPC "); +#endif - 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); - } */ + xlog_warn(buf); } /* @@ -155,7 +139,7 @@ static void log_modes(void) * help the occasional admin. */ static void -usage() +usage(void) { fprintf(stderr,"usage: %s [options]\n", name_p); fprintf(stderr," -h, -?, --help Print this help screen.\n"); @@ -167,6 +151,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"); } @@ -180,49 +165,48 @@ static void create_pidfile(void) unlink(pidfile); fp = fopen(pidfile, "w"); if (!fp) - die("Opening %s failed: %s\n", - pidfile, strerror(errno)); + xlog_err("Opening %s failed: %m\n", pidfile); fprintf(fp, "%d\n", getpid()); pidfd = dup(fileno(fp)); - if (fclose(fp) < 0) - note(N_WARNING, "Flushing pid file failed.\n"); + if (fclose(fp) < 0) { + xlog_warn("Flushing pid file failed: errno %d (%m)\n", + errno); + } } static void truncate_pidfile(void) { - if (pidfd >= 0) - ftruncate(pidfd, 0); + if (pidfd >= 0) { + if (ftruncate(pidfd, 0) < 0) { + xlog_warn("truncating pid file failed: errno %d (%m)\n", + errno); + } + } } -static void drop_privs(void) +static void run_sm_notify(int outport) { - struct stat st; + char op[20]; + char *av[6]; + int ac = 0; - if (stat(SM_DIR, &st) == -1 && - stat(DIR_BASE, &st) == -1) { - st.st_uid = 0; - st.st_gid = 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 (st.st_uid == 0) { - note(N_WARNING, "statd running as root. chown %s to choose different user\n", - SM_DIR); - return; + if (run_mode & STATIC_HOSTNAME) { + av[ac++] = "-v"; + av[ac++] = MY_NAME; } - /* better chown the pid file before dropping, as if it - * if over nfs we might loose access - */ - if (pidfd >= 0) - fchown(pidfd, st.st_uid, st.st_gid); + av[ac] = NULL; + execv(av[0], av); + fprintf(stderr, "%s: failed to run %s\n", name_p, av[0]); + exit(2); - setgroups(0, NULL); - if (setgid(st.st_gid) == -1 - || setuid(st.st_uid) == -1) { - note(N_ERROR, "Fail to drop privileges"); - exit(1); - } } - /* * Entry routine/main loop. */ @@ -239,6 +223,8 @@ int main (int argc, char **argv) /* Default: daemon mode, no other options */ run_mode = 0; + xlog_stderr(0); + xlog_syslog(1); /* Set the basename */ if ((name_p = strrchr(argv[0],'/')) != NULL) { @@ -247,22 +233,15 @@ int main (int argc, char **argv) name_p = argv[0]; } - /* Get the version */ - if ((version_p = strrchr(VERSION,' ')) != NULL) { - version_p++; - } else { - version_p = VERSION; - } - /* Set hostname */ 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': - printf("%s version %s\n",name_p,version_p); + printf("%s version " VERSION "\n",name_p); exit(0); case 'F': /* Foreground/nodaemon mode */ run_mode |= MODE_NODAEMON; @@ -270,6 +249,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; @@ -296,34 +278,8 @@ int main (int argc, char **argv) MY_NAME = xstrdup(optarg); break; case 'P': - - if ((DIR_BASE = xstrdup(optarg)) == NULL) { - fprintf(stderr, "%s: xstrdup(%s) failed!\n", - argv[0], optarg); - exit(1); - } - - SM_DIR = xmalloc(strlen(DIR_BASE) + 1 + sizeof("sm")); - SM_BAK_DIR = xmalloc(strlen(DIR_BASE) + 1 + sizeof("sm.bak")); - SM_STAT_PATH = xmalloc(strlen(DIR_BASE) + 1 + sizeof("state")); - - if ((SM_DIR == NULL) - || (SM_BAK_DIR == NULL) - || (SM_STAT_PATH == NULL)) { - - fprintf(stderr, "%s: xmalloc() failed!\n", - argv[0]); + if (!nsm_setup_pathnames(argv[0], optarg)) exit(1); - } - if (DIR_BASE[strlen(DIR_BASE)-1] == '/') { - sprintf(SM_DIR, "%ssm", DIR_BASE ); - sprintf(SM_BAK_DIR, "%ssm.bak", DIR_BASE ); - sprintf(SM_STAT_PATH, "%sstate", DIR_BASE ); - } else { - sprintf(SM_DIR, "%s/sm", DIR_BASE ); - sprintf(SM_BAK_DIR, "%s/sm.bak", DIR_BASE ); - sprintf(SM_STAT_PATH, "%s/state", DIR_BASE ); - } break; case 'H': /* PRC: specify the ha-callout program */ if ((ha_callout_prog = xstrdup(optarg)) == NULL) { @@ -347,6 +303,12 @@ int main (int argc, char **argv) exit(-1); } + if (run_mode & MODE_NOTIFY_ONLY) { + fprintf(stderr, "%s: -N deprecated, consider using /usr/sbin/sm-notify directly\n", + name_p); + run_sm_notify(out_port); + } + if (!(run_mode & MODE_NODAEMON)) { run_mode &= ~MODE_LOG_STDERR; /* Never log to console in daemon mode. */ @@ -395,10 +357,6 @@ int main (int argc, char **argv) /* Child. */ close(pipefds[0]); setsid (); - if (chdir (DIR_BASE) == -1) { - perror("statd: Could not chdir"); - exit(1); - } while (pipefds[1] <= 2) { pipefds[1] = dup(pipefds[1]); @@ -418,7 +376,13 @@ int main (int argc, char **argv) /* Child. */ - log_init (name_p,version_p); + if (run_mode & MODE_LOG_STDERR) { + xlog_syslog(0); + xlog_stderr(1); + xlog_config(D_ALL, 1); + } + xlog_open(name_p); + xlog(L_NOTICE, "Version " VERSION " starting"); log_modes(); @@ -435,49 +399,95 @@ int main (int argc, char **argv) */ signal(SIGPIPE, SIG_IGN); - /* initialize out_port */ - statd_get_socket(out_port); - 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 */ - /* If we got this far, we have successfully started, so notify parent */ - if (pipefds[1] > 0) { - status = 0; - write(pipefds[1], &status, 1); - close(pipefds[1]); - pipefds[1] = -1; - } + /* Make sure we have a privilege port for calling into the kernel */ + if (statd_get_socket() < 0) + exit(1); + + /* If sm-notify didn't take all the state files, load + * state information into our notify-list so we can + * pass on any SM_NOTIFY that arrives + */ + load_state(); + + MY_STATE = nsm_get_state(0); + if (MY_STATE == 0) + exit(1); + xlog(D_GENERAL, "Local NSM state number: %d", MY_STATE); + nsm_update_kernel_state(MY_STATE); - notify_hosts (); /* Send out notify requests */ - ++restart; + /* + * ORDER + * Clear old listeners while still root, to override any + * permission checking done by rpcbind. + */ + statd_unregister(); - /* this registers both UDP and TCP services */ - if (!(run_mode & MODE_NOTIFY_ONLY)) { - rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port); - } + /* + * ORDER + */ + if (!nsm_drop_privileges(pidfd)) + exit(1); + /* + * ORDER + * Create RPC listeners after dropping privileges. This permits + * statd to unregister its own listeners when it exits. + */ + if (nfs_svc_create("statd", SM_PROG, SM_VERS, sm_prog_1, port) == 0) { + xlog(L_ERROR, "failed to create RPC listeners, exiting"); + exit(1); + } + atexit(statd_unregister); + + /* If we got this far, we have successfully started, so notify parent */ + if (pipefds[1] > 0) { + status = 0; + if (write(pipefds[1], &status, 1) != 1) { + xlog_warn("writing to parent pipe failed: errno %d (%s)\n", + errno, strerror(errno)); + } + close(pipefds[1]); + pipefds[1] = -1; + } + + for (;;) { /* * 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; }