summaryrefslogtreecommitdiffstats
path: root/sshd.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-23 02:37:10 +0200
committerBen Lindstrom <mouring@eviladmin.org>2002-06-23 02:37:10 +0200
commit57f08005d3626a4f96a1af18ad47d55f2241f6c3 (patch)
tree1fa8349d31161fc81f0fb470734a2ec69092006b /sshd.c
parent - stevesk@cvs.openbsd.org 2002/06/22 16:45:29 (diff)
downloadopenssh-57f08005d3626a4f96a1af18ad47d55f2241f6c3.tar.xz
openssh-57f08005d3626a4f96a1af18ad47d55f2241f6c3.zip
- 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@
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index d60b13d66..6b29e7094 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
*/
#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/bn.h>
@@ -1354,7 +1354,7 @@ main(int ac, char **av)
*/
#if 0
/* XXX: this breaks Solaris */
- if (setsid() < 0)
+ if (!debug_flag && !inetd_flag && setsid() < 0)
error("setsid: %.100s", strerror(errno));
#endif