- (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@
This commit is contained in:
Darren Tucker 2003-09-25 20:18:33 +10:00
parent beaf6790e1
commit b88fcc755d
3 changed files with 7 additions and 9 deletions

View File

@ -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@
20030924 20030924
- (djm) Update version.h and spec files for HEAD - (djm) Update version.h and spec files for HEAD
- (dtucker) [configure.ac] IRIX5 needs the same setre[ug]id defines as IRIX6. - (dtucker) [configure.ac] IRIX5 needs the same setre[ug]id defines as IRIX6.
@ -1223,4 +1228,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3041 2003/09/24 10:03:48 dtucker Exp $ $Id: ChangeLog,v 1.3042 2003/09/25 10:18:33 dtucker Exp $

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.167 2003/09/24 10:03:48 dtucker Exp $ # $Id: configure.ac,v 1.168 2003/09/25 10:18:34 dtucker Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -146,7 +146,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(LOGIN_NO_ENDOPT) AC_DEFINE(LOGIN_NO_ENDOPT)
AC_DEFINE(LOGIN_NEEDS_UTMPX) AC_DEFINE(LOGIN_NEEDS_UTMPX)
AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(DISABLE_UTMP) AC_DEFINE(DISABLE_UTMP)
AC_DEFINE(LOCKED_PASSWD_STRING, "*") AC_DEFINE(LOCKED_PASSWD_STRING, "*")
AC_DEFINE(SPT_TYPE,SPT_PSTAT) AC_DEFINE(SPT_TYPE,SPT_PSTAT)
@ -163,7 +162,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(LOGIN_NO_ENDOPT) AC_DEFINE(LOGIN_NO_ENDOPT)
AC_DEFINE(LOGIN_NEEDS_UTMPX) AC_DEFINE(LOGIN_NEEDS_UTMPX)
AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(DISABLE_UTMP) AC_DEFINE(DISABLE_UTMP)
AC_DEFINE(LOCKED_PASSWD_STRING, "*") AC_DEFINE(LOCKED_PASSWD_STRING, "*")
AC_DEFINE(SPT_TYPE,SPT_PSTAT) AC_DEFINE(SPT_TYPE,SPT_PSTAT)
@ -177,7 +175,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
AC_DEFINE(LOGIN_NO_ENDOPT) AC_DEFINE(LOGIN_NO_ENDOPT)
AC_DEFINE(LOGIN_NEEDS_UTMPX) AC_DEFINE(LOGIN_NEEDS_UTMPX)
AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(DISABLE_UTMP) AC_DEFINE(DISABLE_UTMP)
AC_DEFINE(LOCKED_PASSWD_STRING, "*") AC_DEFINE(LOCKED_PASSWD_STRING, "*")
AC_DEFINE(SPT_TYPE,SPT_PSTAT) AC_DEFINE(SPT_TYPE,SPT_PSTAT)

View File

@ -104,10 +104,6 @@ shadow_pw(struct passwd *pw)
if (spw != NULL) if (spw != NULL)
pw_password = spw->ufld.fd_encrypt; 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 # endif
return pw_password; return pw_password;