diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2003-09-25 20:17:53 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2003-09-25 20:17:53 +1000 |
| commit | 99609f5c1941a7384ea270e76e571da4652b883e (patch) | |
| tree | d1bda86ea53a1447e513b04b45c0adcee564d199 | |
| parent | 6dbe10d82295512af03b81649c26841381318996 (diff) | |
- (dtucker) [configure.ac openbsd-compat/xcrypt.c] Bug #633: Remove
DISABLE_SHADOW for HP-UX, use getspnam instead of getprpwnam. Patch from
michael_steffens at hp.com, ok djm@
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | openbsd-compat/xcrypt.c | 4 |
3 files changed, 7 insertions, 9 deletions
@@ -1,3 +1,8 @@ +20030925 + - (dtucker) [configure.ac openbsd-compat/xcrypt.c] Bug #633: Remove + DISABLE_SHADOW for HP-UX, use getspnam instead of getprpwnam. Patch from + michael_steffens at hp.com, ok djm@ + 20030923 - (dtucker) OpenBSD CVS Sync - markus@cvs.openbsd.org 2003/09/18 07:52:54 @@ -1188,4 +1193,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2994.2.34 2003/09/23 09:33:17 djm Exp $ +$Id: ChangeLog,v 1.2994.2.35 2003/09/25 10:17:53 dtucker Exp $ diff --git a/configure.ac b/configure.ac index 916dc107..0db84e1c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.154.2.11 2003/09/23 09:24:21 djm Exp $ +# $Id: configure.ac,v 1.154.2.12 2003/09/25 10:17:53 dtucker Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -146,7 +146,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) AC_DEFINE(USE_PIPES) AC_DEFINE(LOGIN_NO_ENDOPT) AC_DEFINE(LOGIN_NEEDS_UTMPX) - AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_UTMP) AC_DEFINE(LOCKED_PASSWD_STRING, "*") AC_DEFINE(SPT_TYPE,SPT_PSTAT) @@ -163,7 +162,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) AC_DEFINE(USE_PIPES) AC_DEFINE(LOGIN_NO_ENDOPT) AC_DEFINE(LOGIN_NEEDS_UTMPX) - AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_UTMP) AC_DEFINE(LOCKED_PASSWD_STRING, "*") AC_DEFINE(SPT_TYPE,SPT_PSTAT) @@ -177,7 +175,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) AC_DEFINE(USE_PIPES) AC_DEFINE(LOGIN_NO_ENDOPT) AC_DEFINE(LOGIN_NEEDS_UTMPX) - AC_DEFINE(DISABLE_SHADOW) AC_DEFINE(DISABLE_UTMP) AC_DEFINE(LOCKED_PASSWD_STRING, "*") AC_DEFINE(SPT_TYPE,SPT_PSTAT) diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index 5b5d69c7..a0fe6c62 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c @@ -104,10 +104,6 @@ shadow_pw(struct passwd *pw) if (spw != NULL) pw_password = spw->ufld.fd_encrypt; -# elif defined(__hpux) && !defined(HAVE_SECUREWARE) - struct pr_passwd *spw; - if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL) - pw_password = spw->ufld.fd_encrypt; # endif return pw_password; |