summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sshd.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d73ae5114..0b340d5c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
5 Change "a SSH" to "an SSH". Hurray, I'm not the only one who 5 Change "a SSH" to "an SSH". Hurray, I'm not the only one who
6 pronounces "SSH" as "ess-ess-aich". 6 pronounces "SSH" as "ess-ess-aich".
7 OK jmc@ and stevesk@. 7 OK jmc@ and stevesk@.
8 - (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings
9 on older versions of OS X. ok djm@
8 10
920061016 1120061016
10 - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros 12 - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros
@@ -2536,4 +2538,4 @@
2536 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2538 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2537 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2539 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2538 2540
2539$Id: ChangeLog,v 1.4571 2006/10/17 21:53:06 dtucker Exp $ 2541$Id: ChangeLog,v 1.4572 2006/10/18 12:51:31 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 6159a5b6a..06ec03b20 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1436,8 +1436,9 @@ 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 privsep_pw->pw_passwd = "*";
1440 privsep_pw = pwcopy(privsep_pw); 1439 privsep_pw = pwcopy(privsep_pw);
1440 xfree(privsep_pw->pw_passwd);
1441 privsep_pw->pw_passwd = xstrdup("*");
1441 endpwent(); 1442 endpwent();
1442 1443
1443 /* load private host keys */ 1444 /* load private host keys */