summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3af1ff35a..6af6190c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
11 Scott Strickler, ok djm@. 11 Scott Strickler, ok djm@.
12 - (dtucker) [monitor.c] Correctly handle auditing of single commands when 12 - (dtucker) [monitor.c] Correctly handle auditing of single commands when
13 using Protocol 1. From jhb at freebsd. 13 using Protocol 1. From jhb at freebsd.
14 - (djm) [sshd.c] Fix warning/API abuse; ok dtucker@
14 15
1520060912 1620060912
16 - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in] 17 - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in]
@@ -5447,4 +5448,4 @@
5447 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5448 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5448 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5449 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5449 5450
5450$Id: ChangeLog,v 1.4548 2006/09/17 02:00:13 dtucker Exp $ 5451$Id: ChangeLog,v 1.4549 2006/09/17 04:04:46 djm Exp $
diff --git a/sshd.c b/sshd.c
index e61adc1b5..6159a5b6a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1436,7 +1436,7 @@ main(int ac, char **av)
1436 fatal("Privilege separation user %s does not exist", 1436 fatal("Privilege separation user %s does not exist",
1437 SSH_PRIVSEP_USER); 1437 SSH_PRIVSEP_USER);
1438 memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd)); 1438 memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd));
1439 strlcpy(privsep_pw->pw_passwd, "*", sizeof(privsep_pw->pw_passwd)); 1439 privsep_pw->pw_passwd = "*";
1440 privsep_pw = pwcopy(privsep_pw); 1440 privsep_pw = pwcopy(privsep_pw);
1441 endpwent(); 1441 endpwent();
1442 1442