In recent Fedora builds, the '-D _FORTIFY_SOURCE=2' compile

[nfs-utils.git] / utils / statd / statd.c

diff --git a/utils/statd/statd.c b/utils/statd/statd.c
index 157de853bf5aa4fbab1d6cc655f40beb6b806bca..1c5247ea2365aa0112ecda69956b95e04862d014 100644 (file)
--- a/utils/statd/statd.c
+++ b/utils/statd/statd.c
@@ -75,7 +75,7 @@ static struct option longopts[] =
 };
 
 extern void sm_prog_1 (struct svc_req *, register SVCXPRT *);
-extern int statd_get_socket(void);
+static void load_state_number(void);
 
 #ifdef SIMULATIONS
 extern void simulator (int, char **);
@@ -88,9 +88,11 @@ extern void simulator (int, char **);
 static void 
 sm_prog_1_wrapper (struct svc_req *rqstp, register SVCXPRT *transp)
 {
+       struct sockaddr_in *sin = nfs_getrpccaller_in(transp);
+
        /* remote host authorization check */
-       if (!check_default("statd", svc_getcaller(transp),
-                                rqstp->rq_proc, SM_PROG)) {
+       if (sin->sin_family == AF_INET &&
+           !check_default("statd", sin, rqstp->rq_proc, SM_PROG)) {
                svcerr_auth (transp, AUTH_FAILED);
                return;
        }
@@ -147,7 +149,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");
@@ -177,14 +179,20 @@ static void create_pidfile(void)
                    pidfile, strerror(errno));
        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) {
+               note(N_WARNING, "Flushing pid file failed: errno %d (%s)\n",
+                       errno, strerror(errno));
+       }
 }
 
 static void truncate_pidfile(void)
 {
-       if (pidfd >= 0)
-               ftruncate(pidfd, 0);
+       if (pidfd >= 0) {
+               if (ftruncate(pidfd, 0) < 0) {
+                       note(N_WARNING, "truncating pid file failed: errno %d (%s)\n",
+                               errno, strerror(errno));
+               }
+       }
 }
 
 static void drop_privs(void)
@@ -205,9 +213,12 @@ static void drop_privs(void)
        /* 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);
-
+       if (pidfd >= 0) {
+               if (fchown(pidfd, st.st_uid, st.st_gid) < 0) {
+                       note(N_ERROR, "Unable to change owner of %s: %d (%s)",
+                                       SM_DIR, strerror (errno));
+               }
+       }
        setgroups(0, NULL);
        if (setgid(st.st_gid) == -1
            || setuid(st.st_uid) == -1) {
@@ -230,12 +241,10 @@ static void run_sm_notify(int outport)
                av[ac++] = op;
        }
        if (run_mode & STATIC_HOSTNAME) {
-               av[ac++] = "-N";
+               av[ac++] = "-v";
                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);
@@ -251,7 +260,6 @@ 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;
@@ -369,8 +377,11 @@ int main (int argc, char **argv)
                exit(-1);
        }
 
-       if (run_mode & MODE_NOTIFY_ONLY)
+       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)) {
@@ -444,7 +455,7 @@ int main (int argc, char **argv)
 
        /* Child. */
 
-       log_init (name_p,version_p);
+       log_init (/*name_p,version_p*/);
 
        log_modes();
 
@@ -475,25 +486,35 @@ int main (int argc, char **argv)
                        waitpid(pid, NULL, 0);
                }
 
+       /* Make sure we have a privilege port for calling into the kernel */
+       if (statd_get_socket() < 0)
+               exit(1);
 
-       for (;;) {
-               pmap_unset (SM_PROG, SM_VERS);
+       /* 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();
+       load_state_number();
+       pmap_unset (SM_PROG, SM_VERS);
 
-               /* 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;
+       /* this registers both UDP and TCP services */
+       rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port);
+
+       /* 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) {
+                       note(N_WARNING, "writing to parent pipe failed: errno %d (%s)\n",
+                               errno, strerror(errno));
                }
+               close(pipefds[1]);
+               pipefds[1] = -1;
+       }
 
-               /* this registers both UDP and TCP services */
-               rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port);
+       drop_privs();
 
-               if (once) {
-                       once = 0;
-                       drop_privs();
-               }
+       for (;;) {
                /*
                 * Handle incoming requests:  SM_NOTIFY socket requests, as
                 * well as callbacks from lockd.
@@ -520,3 +541,29 @@ int main (int argc, char **argv)
        }
        return 0;
 }
+
+static void
+load_state_number(void)
+{
+       int fd;
+       const char *file = "/proc/sys/fs/nfs/nsm_local_state";
+
+       if ((fd = open(SM_STAT_PATH, O_RDONLY)) == -1)
+               return;
+
+       if (read(fd, &MY_STATE, sizeof(MY_STATE)) != sizeof(MY_STATE)) {
+               note(N_WARNING, "Unable to read state from '%s': errno %d (%s)",
+                               SM_STAT_PATH, errno, strerror(errno));
+       }
+       close(fd);
+       fd = open(file, O_WRONLY);
+       if (fd >= 0) {
+               char buf[20];
+               snprintf(buf, sizeof(buf), "%d", MY_STATE);
+               if (write(fd, buf, strlen(buf)) != strlen(buf))
+                       note(N_WARNING, "Writing to '%s' failed: errno %d (%s)",
+                               file, errno, strerror(errno));
+               close(fd);
+       }
+
+}