server/admin.c: Remove spurious `ping' in usage message.

[tripe] / server / privsep.c

diff --git a/server/privsep.c b/server/privsep.c
index 0b5390e..ffe6404 100644 (file)
--- a/server/privsep.c
+++ b/server/privsep.c
@@ -163,13 +163,13 @@ static void reap(int sig, void *p)
  *
  * Arguments:  @int detachp@ = whether to detach the child from its terminal
  *
- * Returns:    ---
+ * Returns:    Zero on success, @-1@ on failure.
  *
  * Use:                Separates off the privileged tunnel-opening service from the
  *             rest of the server.
  */
 
-void ps_split(int detachp)
+int ps_split(int detachp)
 {
   pid_t kid;
   int fd[2];
@@ -177,9 +177,8 @@ void ps_split(int detachp)
   const char *helper;
 
   if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd)) {
-    die(EXIT_FAILURE,
-       "failed to create socket pair for privilege separation: %s",
-       strerror(errno));
+    a_warn("PRIVSEP", "socketpair-create-failed", "?ERRNO", A_END);
+    return (-1);
   }
   helper = getenv("TRIPE_PRIVHELPER");
   if (!helper) helper = PRIVSEP_HELPER;
@@ -201,6 +200,7 @@ void ps_split(int detachp)
   T( trace(T_PRIVSEP, "privsep: forked child successfully"); )
   close(fd[0]);
   pc_fd = fd[1];
+  return (0);
 }
 
 /* --- @ps_quit@ --- *