[sshd.c]
     don't call setsid() if debugging or run from inetd; no "Operation not
     permitted" errors now; ok millert@ markus@
This commit is contained in:
Ben Lindstrom 2002-06-23 00:37:10 +00:00
parent 959de99aa0
commit 57f08005d3
2 changed files with 7 additions and 3 deletions

View File

@ -24,6 +24,10 @@
- stevesk@cvs.openbsd.org 2002/06/22 16:45:29 - stevesk@cvs.openbsd.org 2002/06/22 16:45:29
[ssh-agent.1 sshd.8 sshd_config.5] [ssh-agent.1 sshd.8 sshd_config.5]
use process ID vs. pid/PID/process identifier use process ID vs. pid/PID/process identifier
- stevesk@cvs.openbsd.org 2002/06/22 20:05:27
[sshd.c]
don't call setsid() if debugging or run from inetd; no "Operation not
permitted" errors now; ok millert@ markus@
20020622 20020622
- (djm) Update README.privsep; spotted by fries@ - (djm) Update README.privsep; spotted by fries@
@ -1033,4 +1037,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2251 2002/06/23 00:35:25 mouring Exp $ $Id: ChangeLog,v 1.2252 2002/06/23 00:37:10 mouring Exp $

4
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.247 2002/06/22 16:40:19 stevesk Exp $"); RCSID("$OpenBSD: sshd.c,v 1.248 2002/06/22 20:05:27 stevesk Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -1354,7 +1354,7 @@ main(int ac, char **av)
*/ */
#if 0 #if 0
/* XXX: this breaks Solaris */ /* XXX: this breaks Solaris */
if (setsid() < 0) if (!debug_flag && !inetd_flag && setsid() < 0)
error("setsid: %.100s", strerror(errno)); error("setsid: %.100s", strerror(errno));
#endif #endif