#include <errno.h>
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#include <assert.h>
#include <fnmatch.h>
#include <sys/wait.h>
pid_t overlordpid;
static pid_t checkpid= -1, detachpid= -1;
-static sig_atomic_t needcheck= 1;
+static sig_atomic_t needcheck= 1; /* 2 means we half-expect the server to be down */
static void checkstalepipes(void) {
/* There is an unimportant race here. If there is a stale pipe but
static void sighandler_chld(int x) {
pid_t r;
- int status, es, ar;
+ int status, es;
es= errno;
for (;;) {
(long)checkpid,status);
}
checkpid= -1;
- ar= alarm(USERVD_MYSELF_CHECK);
- if (ar<0) { syslog(LOG_CRIT,"set alarm for next check: %m"); exit(5); }
+ alarm(USERVD_MYSELF_CHECK);
} else {
if (WIFSIGNALED(status)) {
syslog(LOG_ERR,"call pid %ld %s due to signal %s",
} else if (!WIFEXITED(status)) {
syslog(LOG_ERR,"call pid %ld died due to unknown reason, code %d",
(long)r,status);
+ } else if (WEXITSTATUS(status)==10) {
+ needcheck= 2;
} else if (WEXITSTATUS(status)>12) {
if (WEXITSTATUS(status)>24)
syslog(LOG_ERR,"call pid %ld exited with status %d >24",
(long)r,WEXITSTATUS(status));
checkstalepipes();
+ needcheck= 1;
}
}
}
r= sigprocmask(how,&set,0); assert(!r);
}
-static void NONRETURNING docheck(void) {
+static void NONRETURNING docheck(int needwanted) {
#ifndef DEBUG
/* This subprocess exits with status 0 if the parent should die,
* 1 if it should not, and something else if it fails horribly.
r= connect(sfd,(struct sockaddr*)&ssockname,sizeof(ssockname));
if (r) {
- if (errno == ECONNREFUSED || errno == ENOENT)
- { syslog(LOG_WARNING,"real uservd daemon is not running: %m"); exit(0); }
+ if (errno == ECONNREFUSED || errno == ENOENT) {
+ if (needwanted != 2)
+ syslog(LOG_WARNING,"real uservd daemon is not running: %m");
+ exit(0);
+ }
syslog(LOG_ERR,"unable to connect to uservd daemon: %m"); exit(1);
}
- r= alarm(USERVD_MYSELF_TIMEOUT);
- if (r<0) { syslog(LOG_ERR,"set alarm for read: %m"); exit(1); }
+ alarm(USERVD_MYSELF_TIMEOUT);
remain= sizeof(opening_mbuf); p= (unsigned char*)&opening_mbuf;
while (remain) {
r= read(sfd,p,remain);
}
int main(int argc, char *const *argv) {
- int mfd, sfd, nfd, csocklen, e, r, becomedaemon;
+ int mfd, sfd, nfd, e, r, becomedaemon;
+ socklen_t csocklen;
struct sigaction sigact;
struct sockaddr_un ssockname, csockname;
pid_t child, parentpid, sid;
for (;;) {
if (needcheck) {
- assert(checkpid==-1);
- for (;;) {
+ while (checkpid==-1) {
checkpid= fork();
if (checkpid!=-1) {
- if (!checkpid) docheck();
+ if (!checkpid) docheck(needcheck);
break;
} else if (errno==EAGAIN) {
syslog(LOG_ERR,"fork for check - will wait and retry: %m");
- r= alarm(USERVD_CHECKFORK_RETRY);
- if (r<0) { syslog(LOG_CRIT,"set alarm for retry check: %m"); exit(5); }
+ alarm(USERVD_CHECKFORK_RETRY);
break;
} else if (errno!=EINTR) {
syslog(LOG_CRIT,"fork for check: %m"); exit(5);