Don't do priv separation if no priv connections to make.

diff --git a/privconn.c b/privconn.c
index fcd292bbf9dd5382e134dad3dd9a38d696bee7e8..b2dfaef0a31f56a3cd324ef683dce96b96f20585 100644 (file)
--- a/privconn.c
+++ b/privconn.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: privconn.c,v 1.1 2003/11/29 20:36:07 mdw Exp $
+ * $Id: privconn.c,v 1.2 2003/11/29 20:43:01 mdw Exp $

  *
  * Making privileged connections
  *
  *
  * Making privileged connections
  *


@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: privconn.c,v $
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: privconn.c,v $

+ * Revision 1.2  2003/11/29 20:43:01  mdw
+ * Don't do priv separation if no priv connections to make.
+ *

  * Revision 1.1  2003/11/29 20:36:07  mdw
  * Privileged outgoing connections.
  *
  * Revision 1.1  2003/11/29 20:36:07  mdw
  * Privileged outgoing connections.
  *


@@ -285,7 +288,7 @@ void privconn_split(sel_state *s)
   pid_t kid;
   int fd[2];
 
   pid_t kid;
   int fd[2];
 

-  if (kidfd != -1)
+  if (kidfd != -1 || DA_LEN(&cv) == 0)

     return;
   if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd) < 0)
     die(1, "couldn't create privconn socketpair: %s", strerror(errno));
     return;
   if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd) < 0)
     die(1, "couldn't create privconn socketpair: %s", strerror(errno));