X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fcontext_save.c;h=d1371d017afc4b91f1ca25817f84f725a9c477b4;hp=7d99cc3770a51469b5ee0f5c4828e9d7dac8b5a6;hb=ac0b9fcce4167e2959ebc5b8d6efb8511acec66d;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/sbr/context_save.c b/sbr/context_save.c index 7d99cc3..d1371d0 100644 --- a/sbr/context_save.c +++ b/sbr/context_save.c @@ -16,7 +16,7 @@ static int m_chkids(void); void -context_save (void) +context_save(void) { int action; register struct node *np; @@ -31,28 +31,28 @@ context_save (void) return; ctxflags &= ~CTXMOD; - if ((action = m_chkids ()) > 0) + 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"); + 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); + fprintf(out, "%s: %s\n", np->n_name, np->n_field); + lkfclose(out, ctxpath); - SIGPROCMASK (SIG_SETMASK, &oset, &set); /* reset the signal mask */ + sigprocmask(SIG_SETMASK, &oset, &set); /* reset the signal mask */ if (action == 0) - _exit (0); /* we are child, time to die */ + _exit(0); /* we are child, time to die */ } /* @@ -66,29 +66,25 @@ context_save (void) */ static int -m_chkids (void) +m_chkids(void) { - int i; pid_t pid; - if (getuid () == geteuid ()) + if (getuid() == geteuid()) return (-1); - for (i = 0; (pid = fork ()) == -1 && i < 5; i++) - sleep (5); + switch (pid = fork()) { + 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;