server/tripe.c: Don't start privsep helper unless some tunnel needs it.

[tripe] / server / tripe.c

diff --git a/server/tripe.c b/server/tripe.c
index b84388573d1e02dd4b038d210733543ddd9be806..ed54c5edfdc5cf7b8936cddfef1615b8b31d4132 100644 (file)
--- a/server/tripe.c
+++ b/server/tripe.c
@@ -304,7 +304,14 @@ int main(int argc, char *argv[])
       af |= AF_FOREGROUND;
     a_create(STDIN_FILENO, STDOUT_FILENO, af);
   }
       af |= AF_FOREGROUND;
     a_create(STDIN_FILENO, STDOUT_FILENO, af);
   }

-  ps_split(f & f_daemon);
+
+  for (i = 0; tunnels[i]; i++) {
+    if (tunnels[i]->flags&TUNF_PRIVOPEN) {
+      ps_split(f & f_daemon);
+      break;
+    }
+  }
+

   a_init(csock, u, g, csockmode);
   u_setugid(u, g);
   km_init(kr_priv, kr_pub, tag_priv);
   a_init(csock, u, g, csockmode);
   u_setugid(u, g);
   km_init(kr_priv, kr_pub, tag_priv);