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 @@
      Change "a SSH" to "an SSH".  Hurray, I'm not the only one who
      pronounces "SSH" as "ess-ess-aich".
      OK jmc@ and stevesk@.
+ - (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings
+   on older versions of OS X.  ok djm@
 
 20061016
  - (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros
@@ -2536,4 +2538,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4571 2006/10/17 21:53:06 dtucker Exp $
+$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)
                 fatal("Privilege separation user %s does not exist",
                     SSH_PRIVSEP_USER);
         memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd));
-        privsep_pw->pw_passwd = "*";
         privsep_pw = pwcopy(privsep_pw);
+        xfree(privsep_pw->pw_passwd);
+        privsep_pw->pw_passwd = xstrdup("*");
         endpwent();
 
         /* load private host keys */