X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fcontext_save.c;h=d4a56edc624d7d26a162449d810cbc843774e3b5;hp=4ee40ca81d9dae4b6749e18d252a0d5457ad6caa;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hpb=f480c03187724e54e5391ee61b810827da319a6c diff --git a/sbr/context_save.c b/sbr/context_save.c index 4ee40ca..d4a56ed 100644 --- a/sbr/context_save.c +++ b/sbr/context_save.c @@ -1,4 +1,3 @@ - /* * context_save.c -- write out the updated context file * @@ -19,41 +18,41 @@ static int m_chkids(void); void context_save (void) { - int action; - register struct node *np; - FILE *out; - sigset_t set, oset; - - /* No context in use -- silently ignore any changes! */ - if (!ctxpath) - return; - - if (!(ctxflags & CTXMOD)) - return; - ctxflags &= ~CTXMOD; - - if ((action = m_chkids ()) > 0) - return; /* child did it for us */ - - /* block a few signals */ - sigemptyset (&set); - sigaddset (&set, SIGHUP); - sigaddset (&set, SIGINT); - sigaddset (&set, SIGQUIT); - sigaddset (&set, SIGTERM); - SIGPROCMASK (SIG_BLOCK, &set, &oset); - - if (!(out = lkfopen (ctxpath, "w"))) - adios (ctxpath, "unable to write"); - for (np = m_defs; np; np = np->n_next) - if (np->n_context) - fprintf (out, "%s: %s\n", np->n_name, np->n_field); - lkfclose (out, ctxpath); - - SIGPROCMASK (SIG_SETMASK, &oset, &set); /* reset the signal mask */ - - if (action == 0) - _exit (0); /* we are child, time to die */ + int action; + register struct node *np; + FILE *out; + sigset_t set, oset; + + /* No context in use -- silently ignore any changes! */ + if (!ctxpath) + return; + + if (!(ctxflags & CTXMOD)) + return; + ctxflags &= ~CTXMOD; + + if ((action = m_chkids ()) > 0) + return; /* child did it for us */ + + /* block a few signals */ + sigemptyset (&set); + sigaddset (&set, SIGHUP); + sigaddset (&set, SIGINT); + sigaddset (&set, SIGQUIT); + sigaddset (&set, SIGTERM); + SIGPROCMASK (SIG_BLOCK, &set, &oset); + + if (!(out = lkfopen (ctxpath, "w"))) + adios (ctxpath, "unable to write"); + for (np = m_defs; np; np = np->n_next) + if (np->n_context) + fprintf (out, "%s: %s\n", np->n_name, np->n_field); + lkfclose (out, ctxpath); + + SIGPROCMASK (SIG_SETMASK, &oset, &set); /* reset the signal mask */ + + if (action == 0) + _exit (0); /* we are child, time to die */ } /* @@ -69,28 +68,28 @@ context_save (void) static int m_chkids (void) { - int i; - pid_t pid; + int i; + pid_t pid; - if (getuid () == geteuid ()) - return (-1); + if (getuid () == geteuid ()) + return (-1); - for (i = 0; (pid = fork ()) == -1 && i < 5; i++) - sleep (5); + for (i = 0; (pid = fork ()) == -1 && i < 5; i++) + sleep (5); - switch (pid) { - case -1: - break; + switch (pid) { + case -1: + break; - case 0: - setgid (getgid ()); - setuid (getuid ()); - break; + case 0: + setgid (getgid ()); + setuid (getuid ()); + break; - default: - pidwait (pid, -1); - break; - } + default: + pidwait (pid, -1); + break; + } - return pid; + return pid; }