diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshd.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -24,6 +24,10 @@ | |||
24 | - stevesk@cvs.openbsd.org 2002/06/22 16:45:29 | 24 | - stevesk@cvs.openbsd.org 2002/06/22 16:45:29 |
25 | [ssh-agent.1 sshd.8 sshd_config.5] | 25 | [ssh-agent.1 sshd.8 sshd_config.5] |
26 | use process ID vs. pid/PID/process identifier | 26 | use process ID vs. pid/PID/process identifier |
27 | - stevesk@cvs.openbsd.org 2002/06/22 20:05:27 | ||
28 | [sshd.c] | ||
29 | don't call setsid() if debugging or run from inetd; no "Operation not | ||
30 | permitted" errors now; ok millert@ markus@ | ||
27 | 31 | ||
28 | 20020622 | 32 | 20020622 |
29 | - (djm) Update README.privsep; spotted by fries@ | 33 | - (djm) Update README.privsep; spotted by fries@ |
@@ -1033,4 +1037,4 @@ | |||
1033 | - (stevesk) entropy.c: typo in debug message | 1037 | - (stevesk) entropy.c: typo in debug message |
1034 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1038 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1035 | 1039 | ||
1036 | $Id: ChangeLog,v 1.2251 2002/06/23 00:35:25 mouring Exp $ | 1040 | $Id: ChangeLog,v 1.2252 2002/06/23 00:37:10 mouring Exp $ |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.247 2002/06/22 16:40:19 stevesk Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.248 2002/06/22 20:05:27 stevesk Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -1354,7 +1354,7 @@ main(int ac, char **av) | |||
1354 | */ | 1354 | */ |
1355 | #if 0 | 1355 | #if 0 |
1356 | /* XXX: this breaks Solaris */ | 1356 | /* XXX: this breaks Solaris */ |
1357 | if (setsid() < 0) | 1357 | if (!debug_flag && !inetd_flag && setsid() < 0) |
1358 | error("setsid: %.100s", strerror(errno)); | 1358 | error("setsid: %.100s", strerror(errno)); |
1359 | #endif | 1359 | #endif |
1360 | 1360 | ||