summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-09 20:00:09 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-09 20:00:09 +0000
commitece420413bbcc272300bc14f8944bb2679e4afd2 (patch)
treef6070a210cdcb12a3a03fd9938416ada7f6edcef
parent5a6abdae0f6f2312d8bfd60b8bf2420a3393428d (diff)
- markus@cvs.openbsd.org 2002/06/08 05:07:56
[ssh.c] nuke ptrace comment
-rw-r--r--ChangeLog8
-rw-r--r--ssh.c10
2 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 3eb4100a..9e48cbba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20020609
+ - (bal) OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2002/06/08 05:07:56
+ [ssh.c]
+ nuke ptrace comment
+
20020607
- (bal) Removed --{enable/disable}-suid-ssh
- (bal) Missed __progname in ssh-keysign.c patch by dtucker@zip.com.au
@@ -828,4 +834,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2188 2002/06/07 16:49:11 mouring Exp $
+$Id: ChangeLog,v 1.2189 2002/06/09 20:00:09 mouring Exp $
diff --git a/ssh.c b/ssh.c
index 0afdba7b..8b77a810 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.174 2002/05/23 19:39:34 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.175 2002/06/08 05:07:56 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -717,14 +717,6 @@ again:
* user's home directory if it happens to be on a NFS volume where
* root is mapped to nobody.
*/
-
- /*
- * Note that some legacy systems need to postpone the following call
- * to permanently_set_uid() until the private hostkey is destroyed
- * with RSA_free(). Otherwise the calling user could ptrace() the
- * process, read the private hostkey and impersonate the host.
- * OpenBSD does not allow ptracing of setuid processes.
- */
permanently_set_uid(pw);
/*