tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it 

if we absolutely need it.  Pointed out by Corinna, ok djm@
This commit is contained in:
Darren Tucker 2006-11-07 11:28:40 +11:00
parent 570c2ab1b6
commit df0e438a2e
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20061107
- (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it
if we absolutely need it. Pointed out by Corinna, ok djm@
20061105 20061105
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
- otto@cvs.openbsd.org 2006/10/28 18:08:10 - otto@cvs.openbsd.org 2006/10/28 18:08:10
@ -2588,4 +2592,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.4583 2006/11/04 18:32:02 djm Exp $ $Id: ChangeLog,v 1.4584 2006/11/07 00:28:40 dtucker Exp $

19
sshd.c
View File

@ -1431,14 +1431,17 @@ main(int ac, char **av)
debug("sshd version %.100s", SSH_RELEASE); debug("sshd version %.100s", SSH_RELEASE);
/* Store privilege separation user for later use */ /* Store privilege separation user for later use if required. */
if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) {
fatal("Privilege separation user %s does not exist", if (use_privsep || options.kerberos_authentication)
SSH_PRIVSEP_USER); fatal("Privilege separation user %s does not exist",
memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd)); SSH_PRIVSEP_USER);
privsep_pw = pwcopy(privsep_pw); } else {
xfree(privsep_pw->pw_passwd); memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd));
privsep_pw->pw_passwd = xstrdup("*"); 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 */