further idmapd update

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

diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
index d2ecbebafdcb2dd08c79e60baaf6a3f2798007a6..a5d4f723a660eda5d948e171db3e4f042242a90a 100644 (file)
--- a/utils/idmapd/idmapd.c
+++ b/utils/idmapd/idmapd.c
@@ -109,6 +109,7 @@ TAILQ_HEAD(idmap_clientq, idmap_client);
 
 static void dirscancb(int, short, void *);
 static void clntscancb(int, short, void *);
+static void svrreopen(int, short, void *);
 static int  nfsopen(struct idmap_client *);
 static void nfscb(int, short, void *);
 static void nfsdcb(int, short, void *);
@@ -122,11 +123,13 @@ static void nametoidres(struct idmap_msg *);
 
 static int nfsdopen(char *);
 static int nfsdopenone(struct idmap_client *, short, char *);
+static void nfsdreopen(void);
 
 size_t  strlcat(char *, const char *, size_t);
 size_t  strlcpy(char *, const char *, size_t);
 ssize_t atomicio(ssize_t (*)(), int, void *, size_t);
-int     daemon(int, int);
+void    mydaemon(int, int);
+void    release_parent();
 
 static int verbose = 0;
 static char domain[512];
@@ -144,7 +147,7 @@ main(int argc, char **argv)
 {
        int fd = 0, opt, fg = 0, nfsdret = -1;
        struct idmap_clientq icq;
-       struct event rootdirev, clntdirev;
+       struct event rootdirev, clntdirev, svrdirev;
        struct event initialize;
        struct passwd *pw;
        struct group *gr;
@@ -250,7 +253,7 @@ main(int argc, char **argv)
                warnx("Using domain \"%s\"", domain);
 
        if (!fg)
-               daemon(0, 0);
+               mydaemon(0, 0);
 
        event_init();
 
@@ -279,6 +282,8 @@ main(int argc, char **argv)
                signal_add(&rootdirev, NULL);
                signal_set(&clntdirev, SIGUSR2, clntscancb, &icq);
                signal_add(&clntdirev, NULL);
+               signal_set(&svrdirev, SIGHUP, svrreopen, NULL);
+               signal_add(&svrdirev, NULL);
 
                /* Fetch current state */
                /* (Delay till start of event_dispatch to avoid possibly losing
@@ -290,6 +295,8 @@ main(int argc, char **argv)
        if (nfsdret != 0 && fd == 0)
                errx(1, "Neither NFS client nor NFSd found");
 
+       release_parent();
+
        if (event_dispatch() < 0)
                errx(1, "event_dispatch: returns errno %d (%s)", errno, strerror(errno));
        /* NOTREACHED */
@@ -372,6 +379,12 @@ dirscancb(int fd, short which, void *data)
        return;
 }
 
+static void
+svrreopen(int fd, short which, void *data)
+{
+       nfsdreopen();
+}
+
 static void
 clntscancb(int fd, short which, void *data)
 {
@@ -568,6 +581,38 @@ out:
        event_add(&ic->ic_event, NULL);
 }
 
+static void
+nfsdreopen_one(struct idmap_client *ic)
+{
+       int fd;
+
+       if (verbose > 0)
+               warnx("ReOpening %s", ic->ic_path);
+       if ((fd = open(ic->ic_path, O_RDWR, 0)) != -1) {
+               if (ic->ic_fd != -1)
+                       close(ic->ic_fd);
+               ic->ic_event.ev_fd = ic->ic_fd = fd;
+               if ((ic->ic_event.ev_flags & EVLIST_INIT) == 0) {
+                       event_set(&ic->ic_event, ic->ic_fd, EV_READ, nfsdcb, ic);
+                       event_add(&ic->ic_event, NULL);
+               }
+       } else {
+               warnx("nfsdreopen: Opening '%s' failed: errno %d (%s)",
+                       ic->ic_path, errno, strerror(errno));
+       }
+}
+
+/*
+ * Note: nfsdreopen assumes nfsdopen has already been called
+ */
+static void
+nfsdreopen()
+{
+       nfsdreopen_one(&nfsd_ic[IC_NAMEID]);
+       nfsdreopen_one(&nfsd_ic[IC_IDNAME]);
+       return;
+}
+
 static int
 nfsdopen(char *path)
 {
@@ -778,3 +823,69 @@ getfield(char **bpp, char *fld, size_t fldsz)
 
        return (0);
 }
+/*
+ * mydaemon creates a pipe between the partent and child
+ * process. The parent process will wait until the
+ * child dies or writes a '1' on the pipe signaling
+ * that it started successfully.
+ */
+int pipefds[2] = { -1, -1};
+
+void
+mydaemon(int nochdir, int noclose)
+{
+       int pid, status, tempfd, fdmax, filedes;
+
+       if (pipe(pipefds) < 0)
+               err(1, "mydaemon: pipe() failed: errno %d (%s)\n", errno, strerror(errno));
+
+       if ((pid = fork ()) < 0)
+               err(1, "mydaemon: fork() failed: errno %d (%s)\n", errno, strerror(errno));
+
+       if (pid != 0) {
+               /*
+                * 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 ();
+       if (nochdir == 0) {
+               if (chdir ("/") == -1)
+                       err(1, "mydaemon: chdir() failed: errno %d (%s)\n", errno, strerror(errno));
+       }
+
+       while (pipefds[1] <= 2) {
+               pipefds[1] = dup(pipefds[1]);
+               if (pipefds[1] < 0)
+                       err(1, "mydaemon: dup() failed: errno %d (%s)\n", errno, strerror(errno));
+       }
+
+       if (noclose == 0) {
+               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);
+       }
+
+       return;
+}
+void
+release_parent()
+{
+       int status;
+
+       if (pipefds[1] > 0) {
+               write(pipefds[1], &status, 1);
+               close(pipefds[1]);
+               pipefds[1] = -1;
+       }
+}