Import of OpenSSH 3.2.3p1

[gssapi-openssh.git] / openssh / sshd.c

diff --git a/openssh/sshd.c b/openssh/sshd.c
index 45ccb3d47972e4634f2f438be3621f349f512135..afb872665c1af708dd221f37ef6867c29d659b8d 100644 (file)
--- a/openssh/sshd.c
+++ b/openssh/sshd.c
@@ -1005,6 +1005,7 @@ main(int ac, char **av)
        if (test_flag)
                exit(0);
 
+#ifndef HAVE_CYGWIN
        /*
         * Clear out any supplemental groups we may have inherited.  This
         * prevents inadvertent creation of files with bad modes (in the
@@ -1014,6 +1015,7 @@ main(int ac, char **av)
         */
        if (setgroups(0, NULL) < 0)
                debug("setgroups() failed: %.200s", strerror(errno));
+#endif /* !HAVE_CYGWIN */
 
        /* Initialize the log (it is reinitialized below in case we forked). */
        if (debug_flag && !inetd_flag)
@@ -1336,8 +1338,11 @@ main(int ac, char **av)
         * setlogin() affects the entire process group.  We don't
         * want the child to be able to affect the parent.
         */
+#if 0
+       /* XXX: this breaks Solaris */
        if (setsid() < 0)
                error("setsid: %.100s", strerror(errno));
+#endif
 
        /*
         * Disable the key regeneration alarm.  We will not regenerate the