summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-03-08 23:11:25 +1100
committerDamien Miller <djm@mindrot.org>2004-03-08 23:11:25 +1100
commit57aae982bec2e5e8e9db487626c24f7c35aedfb2 (patch)
treead4a62fd17e83b6f4c2b3021dd01ddd297aaa0a5
parentdbf7a74ee569a9544276db42eb7aee1141072a24 (diff)
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2004/03/03 06:47:52 [sshd.c] change proctiltle after accept(2); ok henning, deraadt, djm
-rw-r--r--ChangeLog12
-rw-r--r--sshd.c3
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index cfedf899..56fb2fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,9 +6,13 @@
inherited by the child. ok djm@
- (dtucker) [auth-pam.c auth-pam.h auth1.c auth2.c monitor.c monitor_wrap.c
monitor_wrap.h] Bug #808: Ensure force_pwchange is correctly initialized
- even if keyboard-interactive is not used by the client. Prevents segfaults
- in some cases where the user's password is expired (note this is not
- considered a security exposure). ok djm@
+ even if keyboard-interactive is not used by the client. Prevents
+ segfaults in some cases where the user's password is expired (note this
+ is not considered a security exposure). ok djm@
+ - (djm) OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2004/03/03 06:47:52
+ [sshd.c]
+ change proctiltle after accept(2); ok henning, deraadt, djm
20040307
- (tim) [regress/login-timeout.sh] fix building outside of source tree.
@@ -869,4 +873,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3279 2004/03/08 12:04:06 dtucker Exp $
+$Id: ChangeLog,v 1.3280 2004/03/08 12:11:25 djm Exp $
diff --git a/sshd.c b/sshd.c
index 3247091a..9462bf0a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.287 2004/02/25 00:22:45 djm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.288 2004/03/03 06:47:52 markus Exp $");
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -1390,6 +1390,7 @@ main(int ac, char **av)
}
/* This is the child processing a new connection. */
+ setproctitle("%s", "[accepted]");
/*
* Create a new session and process group since the 4.4BSD