diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-10-18 22:51:31 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-10-18 22:51:31 +1000 |
commit | 78802f0af361d90b5e8975cc3f24d35b4fda215f (patch) | |
tree | 13002d39cb038360b633699eeec27f16ff93221c | |
parent | ffe88e15afeb403e775d87cd45ae4bd5f1203172 (diff) |
- (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings
on older versions of OS X. ok djm@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sshd.c | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -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 $ @@ -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 */ |