X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fstatd.c;h=cf30fe46d0a17c3da481346b85f3955dd1165d9f;hp=e758707887963aca31ddfae79785e39e36bcadc3;hb=a75c6d57688b6f4435bac41ffac7c3b8eab1aab1;hpb=012d7fd50654b1623e63c447905187929e559cff diff --git a/utils/statd/statd.c b/utils/statd/statd.c index e758707..cf30fe4 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -11,11 +11,15 @@ #include #include #include +#include +#include #include #include #include #include #include +#include +#include #include "statd.h" #include "version.h" @@ -23,6 +27,17 @@ #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 */ @@ -41,6 +56,9 @@ static struct option longopts[] = { "version", 0, 0, 'v' }, { "outgoing-port", 1, 0, 'o' }, { "port", 1, 0, 'p' }, + { "name", 1, 0, 'n' }, + { "state-directory-path", 1, 0, 'P' }, + { "notify-mode", 0, 0, 'N' }, { NULL, 0, 0, 0 } }; @@ -77,8 +95,10 @@ sm_prog_1_wrapper (struct svc_req *rqstp, register SVCXPRT *transp) static void killer (int sig) { - log (L_FATAL, "Caught signal %d, un-registering and exiting.", sig); - pmap_unset (SM_PROG, SM_VERS); + 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); } @@ -98,16 +118,16 @@ static void log_modes(void) strcat(buf,"No-Daemon "); if (run_mode & MODE_LOG_STDERR) strcat(buf,"Log-STDERR "); - /* future: IP aliasing + if (run_mode & MODE_NOTIFY_ONLY) { strcat(buf,"Notify-Only "); - } */ - log(L_WARNING,buf); + } + note(N_WARNING,buf); /* future: IP aliasing if (run_mode & MODE_NOTIFY_ONLY) { - dprintf(L_DEBUG,"Notify IP: %s",svr_addr); + dprintf(N_DEBUG,"Notify IP: %s",svr_addr); } */ } @@ -125,6 +145,60 @@ usage() fprintf(stderr," -p, --port Port to listen on\n"); fprintf(stderr," -o, --outgoing-port Port for outgoing connections\n"); fprintf(stderr," -V, -v, --version Display version information and exit.\n"); + 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"); +} + +static const char *pidfile = "/var/run/rpc.statd.pid"; + +int pidfd = -1; +static void create_pidfile(void) +{ + FILE *fp; + + unlink(pidfile); + fp = fopen(pidfile, "w"); + if (!fp) + die("Opening %s failed: %s\n", + pidfile, strerror(errno)); + fprintf(fp, "%d\n", getpid()); + pidfd = dup(fileno(fp)); + if (fclose(fp) < 0) + note(N_WARNING, "Flushing pid file failed.\n"); +} + +static void truncate_pidfile(void) +{ + if (pidfd >= 0) + ftruncate(pidfd, 0); +} + +static void drop_privs(void) +{ + struct stat st; + + if (stat(SM_DIR, &st) == -1 && + stat(DIR_BASE, &st) == -1) + st.st_uid = 0; + + if (st.st_uid == 0) { + note(N_WARNING, "statd running as root. chown %s to choose different user\n", + SM_DIR); + return; + } + /* 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); + + setgroups(0, NULL); + if (setgid(st.st_gid) == -1 + || setuid(st.st_uid) == -1) { + note(N_ERROR, "Fail to drop privileges"); + exit(1); + } } /* @@ -136,6 +210,10 @@ int main (int argc, char **argv) int pid; int arg; int port = 0, out_port = 0; + struct rlimit rlim; + + int pipefds[2] = { -1, -1}; + char status; /* Default: daemon mode, no other options */ run_mode = 0; @@ -154,8 +232,11 @@ int main (int argc, char **argv) version_p = VERSION; } + /* Set hostname */ + MY_NAME = NULL; + /* Process command line switches */ - while ((arg = getopt_long(argc, argv, "h?vVFdp:o:", longopts, NULL)) != EOF) { + while ((arg = getopt_long(argc, argv, "h?vVFNdn:p:o:P:", longopts, NULL)) != EOF) { switch (arg) { case 'V': /* Version */ case 'v': @@ -164,6 +245,9 @@ int main (int argc, char **argv) case 'F': /* Foreground/nodaemon mode */ run_mode |= MODE_NODAEMON; break; + case 'N': + run_mode |= MODE_NOTIFY_ONLY; + break; case 'd': /* No daemon only - log to stderr */ run_mode |= MODE_LOG_STDERR; break; @@ -185,6 +269,39 @@ int main (int argc, char **argv) exit(1); } break; + case 'n': /* Specify local hostname */ + 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]); + 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 '?': /* heeeeeelllllllpppp? heh */ case 'h': usage(); @@ -205,9 +322,20 @@ int main (int argc, char **argv) daemon mode. */ } - log_init (name_p,version_p); - - log_modes(); + if (getrlimit (RLIMIT_NOFILE, &rlim) != 0) + fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n", + argv [0], strerror(errno)); + else { + /* glibc sunrpc code dies if getdtablesize > FD_SETSIZE */ + if (rlim.rlim_cur > FD_SETSIZE) { + rlim.rlim_cur = FD_SETSIZE; + + if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) { + fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n", + argv [0], strerror(errno)); + } + } + } #ifdef SIMULATIONS if (argc > 1) @@ -216,53 +344,110 @@ int main (int argc, char **argv) #endif if (!(run_mode & MODE_NODAEMON)) { - int filedes; + int filedes, fdmax, tempfd; + if (pipe(pipefds)<0) { + perror("statd: unable to create pipe"); + exit(1); + } if ((pid = fork ()) < 0) { - perror ("Could not fork"); + perror ("statd: Could not fork"); exit (1); } else if (pid != 0) { - /* Parent. */ + /* Parent. + * Wait for status from child. + */ + close(pipefds[1]); + if (read(pipefds[0], &status, 1) != 1) + exit(1); exit (0); } /* Child. */ + close(pipefds[0]); setsid (); - chdir (DIR_BASE); + if (chdir (DIR_BASE) == -1) { + perror("statd: Could not chdir"); + exit(1); + } - for (filedes = 0; filedes < sysconf (_SC_OPEN_MAX); filedes++) { - close (filedes); + while (pipefds[1] <= 2) { + pipefds[1] = dup(pipefds[1]); + if (pipefds[1]<0) { + perror("statd: dup"); + exit(1); + } } + 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); + } /* Child. */ + + log_init (name_p,version_p); + + log_modes(); + signal (SIGHUP, killer); signal (SIGINT, killer); signal (SIGTERM, killer); /* WARNING: the following works on Linux and SysV, but not BSD! */ signal(SIGCHLD, SIG_IGN); + /* + * Ignore SIGPIPE to avoid statd dying when peers close their + * TCP connection while we're trying to reply to them. + */ + signal(SIGPIPE, SIG_IGN); /* initialize out_port */ statd_get_socket(out_port); + create_pidfile(); + atexit(truncate_pidfile); + drop_privs(); + for (;;) { - pmap_unset (SM_PROG, SM_VERS); + 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); + } 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; + } + notify_hosts (); /* Send out notify requests */ ++restart; - /* future: IP aliasing + /* this registers both UDP and TCP services */ if (!(run_mode & MODE_NOTIFY_ONLY)) { rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port); - } */ - /* this registers both UDP and TCP services */ - rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port); + } /* * 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; } return 0; }