diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshd.c | 19 |
2 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20061107 | ||
2 | - (dtucker) [sshd.c] Use privsep_pw if we have it, but only require it | ||
3 | if we absolutely need it. Pointed out by Corinna, ok djm@ | ||
4 | |||
1 | 20061105 | 5 | 20061105 |
2 | - (djm) OpenBSD CVS Sync | 6 | - (djm) OpenBSD CVS Sync |
3 | - otto@cvs.openbsd.org 2006/10/28 18:08:10 | 7 | - otto@cvs.openbsd.org 2006/10/28 18:08:10 |
@@ -2588,4 +2592,4 @@ | |||
2588 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2592 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2589 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2593 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2590 | 2594 | ||
2591 | $Id: ChangeLog,v 1.4583 2006/11/04 18:32:02 djm Exp $ | 2595 | $Id: ChangeLog,v 1.4584 2006/11/07 00:28:40 dtucker Exp $ |
@@ -1431,14 +1431,17 @@ main(int ac, char **av) | |||
1431 | 1431 | ||
1432 | debug("sshd version %.100s", SSH_RELEASE); | 1432 | debug("sshd version %.100s", SSH_RELEASE); |
1433 | 1433 | ||
1434 | /* Store privilege separation user for later use */ | 1434 | /* Store privilege separation user for later use if required. */ |
1435 | if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) | 1435 | if ((privsep_pw = getpwnam(SSH_PRIVSEP_USER)) == NULL) { |
1436 | fatal("Privilege separation user %s does not exist", | 1436 | if (use_privsep || options.kerberos_authentication) |
1437 | SSH_PRIVSEP_USER); | 1437 | fatal("Privilege separation user %s does not exist", |
1438 | memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd)); | 1438 | SSH_PRIVSEP_USER); |
1439 | privsep_pw = pwcopy(privsep_pw); | 1439 | } else { |
1440 | xfree(privsep_pw->pw_passwd); | 1440 | memset(privsep_pw->pw_passwd, 0, strlen(privsep_pw->pw_passwd)); |
1441 | privsep_pw->pw_passwd = xstrdup("*"); | 1441 | privsep_pw = pwcopy(privsep_pw); |
1442 | xfree(privsep_pw->pw_passwd); | ||
1443 | privsep_pw->pw_passwd = xstrdup("*"); | ||
1444 | } | ||
1442 | endpwent(); | 1445 | endpwent(); |
1443 | 1446 | ||
1444 | /* load private host keys */ | 1447 | /* load private host keys */ |