X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/32fc582f43a9a3841d2782674e055113729c2814..5f8b7a8ea0f928a60a67068408fd7a798024a877:/slip.c

diff --git a/slip.c b/slip.c
index badbc5d..3f7935a 100644
--- a/slip.c
+++ b/slip.c
@@ -230,20 +230,13 @@ 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 (WIFEXITED(status)) {
-	    fatal("%s: userv exited unexpectedly with status %d",
-		  st->slip.nl.name,WEXITSTATUS(status));
-	} else if (WIFSIGNALED(status)) {
-	    fatal("%s: userv exited unexpectedly: uncaught signal %d",
-		  st->slip.nl.name,WTERMSIG(status));
-	} else {
-	    fatal("%s: userv stopped unexpectedly",
-		  st->slip.nl.name);
-	}
+    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");
     }
-    Message(M_WARNING,"%s: userv subprocess died with status %d\n",
-	    st->slip.nl.name,WEXITSTATUS(status));
     st->pid=0;
 }