pull in latest master.
--- a/pop3d.c Thu Apr 10 17:59:07 2014 +0500
+++ b/pop3d.c Thu Apr 10 18:26:13 2014 +0500
@@ -47,7 +47,6 @@
static void usage(void);
static struct imsgev iev_pop3e;
-static pid_t pop3e_pid;
static const char *mpath;
static int mtype = M_MBOX;
@@ -102,7 +101,7 @@
if ((pw = getpwnam(POP3D_USER)) == NULL)
fatalx("main: getpwnam " POP3D_USER);
- pop3e_pid = pop3_main(pair, pw);
+ pop3_main(pair, pw);
close(pair[1]);
setproctitle("[priv]");
logit(LOG_INFO, "pop3d ready; type:%s, path:%s", mtype_str, mpath);
@@ -206,8 +205,9 @@
event_loopexit(NULL);
break;
case SIGCHLD:
- if (waitpid(pop3e_pid, &status, WNOHANG) > 0)
- if (WIFEXITED(status) || WIFSIGNALED(status)) {
+ if (waitpid(WAIT_ANY, &status, WNOHANG) > 0)
+ if ((WIFEXITED(status) && WEXITSTATUS(status) != 0) ||
+ WIFSIGNALED(status)) {
logit(LOG_ERR, "Lost pop3 engine");
event_loopexit(NULL);
}
--- a/pop3d.h Thu Apr 10 17:59:07 2014 +0500
+++ b/pop3d.h Thu Apr 10 18:26:13 2014 +0500
@@ -144,7 +144,7 @@
};
/* pop3e.c */
-pid_t pop3_main(int [2], struct passwd *);
+void pop3_main(int [2], struct passwd *);
/* session.c */
void session_init(struct listener *, int);
--- a/pop3e.c Thu Apr 10 17:59:07 2014 +0500
+++ b/pop3e.c Thu Apr 10 18:26:13 2014 +0500
@@ -47,7 +47,7 @@
struct imsgev iev_pop3d;
void *ssl_ctx;
-pid_t
+void
pop3_main(int pair[2], struct passwd *pw)
{
extern struct session_tree sessions;
@@ -59,7 +59,7 @@
fatal("pop3e: fork");
if (pid > 0)
- return (pid);
+ return;
close(pair[0]);
setproctitle("pop3 engine");