use daemon()

1 files changed, 4 insertions, 12 deletions

diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 0b68143dc47..3629b83e415 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -18,7 +18,7 @@ agent connections.
 */
 
 #include "includes.h"
-RCSID("$Id: sshd.c,v 1.35 1999/10/17 20:39:11 dugsong Exp $");
+RCSID("$Id: sshd.c,v 1.36 1999/10/17 20:43:31 dugsong Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -369,16 +369,9 @@ main(int ac, char **av)
 #ifdef TIOCNOTTY
       int fd;
 #endif /* TIOCNOTTY */
-
-      /* Fork, and have the parent exit.  The child becomes the server. */
-      if (fork())
-	exit(0);
-
-      /* Redirect stdin, stdout, and stderr to /dev/null. */
-      freopen("/dev/null", "r", stdin);
-      freopen("/dev/null", "w", stdout);
-      freopen("/dev/null", "w", stderr);
-
+      if (daemon(0, 0) < 0)
+	  fatal("daemon() failed: %.200s", strerror(errno));
+     
       /* Disconnect from the controlling tty. */
 #ifdef TIOCNOTTY
       fd = open("/dev/tty", O_RDWR|O_NOCTTY);
@@ -388,7 +381,6 @@ main(int ac, char **av)
 	  close(fd);
 	}
 #endif /* TIOCNOTTY */
-      (void)setsid();
     }
 
   /* Reinitialize the log (because of the fork above). */