- (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings

   on older versions of OS X.  ok djm@

diff --git a/ChangeLog b/ChangeLog
index 5d37a810261cda786c32b875df8a2b70ef36deb1..7e930b0c8dd04b7e1392ccbb9de04b3d4bd27f48 100644 (file)
--- 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

diff --git a/sshd.c b/sshd.c
index 6159a5b6afd1bcfcf72a780475d90ae99dd44dba..06ec03b2041fe2e49cfd63ca7d46c79083f885de 100644 (file)
--- 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 */