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

on older versions of OS X.  ok djm@
This commit is contained in:
Darren Tucker 2006-10-18 22:51:31 +10:00
parent ffe88e15af
commit 78802f0af3
2 changed files with 5 additions and 2 deletions

View File

@ -5,6 +5,8 @@
Change "a SSH" to "an SSH". Hurray, I'm not the only one who Change "a SSH" to "an SSH". Hurray, I'm not the only one who
pronounces "SSH" as "ess-ess-aich". pronounces "SSH" as "ess-ess-aich".
OK jmc@ and stevesk@. OK jmc@ and stevesk@.
- (dtucker) [sshd.c] Reshuffle storing of pw struct; prevents warnings
on older versions of OS X. ok djm@
20061016 20061016
- (dtucker) [monitor_fdpass.c] Include sys/in.h, required for cmsg macros - (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 OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

3
sshd.c
View File

@ -1436,8 +1436,9 @@ main(int ac, char **av)
fatal("Privilege separation user %s does not exist", fatal("Privilege separation user %s does not exist",
SSH_PRIVSEP_USER); SSH_PRIVSEP_USER);
memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd)); memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd));
privsep_pw->pw_passwd = "*";
privsep_pw = pwcopy(privsep_pw); privsep_pw = pwcopy(privsep_pw);
xfree(privsep_pw->pw_passwd);
privsep_pw->pw_passwd = xstrdup("*");
endpwent(); endpwent();
/* load private host keys */ /* load private host keys */