From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 6 Oct 2014 23:39:04 +0000 (+0100)
Subject: slip: Report unexpected kinds of death from userv
X-Git-Tag: base.ipv6-polypath-fixes-2.v1~59
X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/commitdiff_plain/6b30affc1ec14bf38a73994e8fdd39f26b5bccb3?hp=4ac7fd3ff73c98100d8a8546668d0212e4af3ffa

slip: Report unexpected kinds of death from userv

If st->expecting_userv_exit, we are expecting userv to exit 0 or die
with SIGTERM.  If anything else happens, we should at least log it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/slip.c b/slip.c
index 59978c9..3f7935a 100644
--- a/slip.c
+++ b/slip.c
@@ -230,7 +230,9 @@ static void userv_userv_callback(void *sst, pid_t pid, int status)
 		"(expected %d)\n",pid,st->pid);
 	return;
     }
-    if (!st->expecting_userv_exit) {
+    if (!(st->expecting_userv_exit &&
+	  (!status ||
+	   (WIFSIGNALED(status) && WTERMSIG(status)==SIGTERM)))) {
 	lg_exitstatus(0,st->slip.nl.name,0,
 		      st->expecting_userv_exit ? M_WARNING : M_FATAL,
 		      status,"userv");