X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/e533c005b62f3e1016b5fb9a3b6973124480a54b..HEAD:/server/privsep.c

diff --git a/server/privsep.c b/server/privsep.c
index d7063b63..ffe64048 100644
--- a/server/privsep.c
+++ b/server/privsep.c
@@ -9,19 +9,18 @@
  *
  * This file is part of Trivial IP Encryption (TrIPE).
  *
- * TrIPE is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * TrIPE is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your
+ * option) any later version.
  *
- * TrIPE is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * TrIPE is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with TrIPE; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /*----- Header files ------------------------------------------------------*/
@@ -164,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];
@@ -178,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;
@@ -202,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@ --- *