diff options
-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 @@ | |||
1 | 20030925 | ||
2 | - (dtucker) [configure.ac openbsd-compat/xcrypt.c] Bug #633: Remove | ||
3 | DISABLE_SHADOW for HP-UX, use getspnam instead of getprpwnam. Patch from | ||
4 | michael_steffens at hp.com, ok djm@ | ||
5 | |||
1 | 20030924 | 6 | 20030924 |
2 | - (djm) Update version.h and spec files for HEAD | 7 | - (djm) Update version.h and spec files for HEAD |
3 | - (dtucker) [configure.ac] IRIX5 needs the same setre[ug]id defines as IRIX6. | 8 | - (dtucker) [configure.ac] IRIX5 needs the same setre[ug]id defines as IRIX6. |
@@ -1223,4 +1228,4 @@ | |||
1223 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1228 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1224 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1229 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1225 | 1230 | ||
1226 | $Id: ChangeLog,v 1.3041 2003/09/24 10:03:48 dtucker Exp $ | 1231 | $Id: ChangeLog,v 1.3042 2003/09/25 10:18:33 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index 812eb4333..505907c30 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.167 2003/09/24 10:03:48 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.168 2003/09/25 10:18:34 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -146,7 +146,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
146 | AC_DEFINE(USE_PIPES) | 146 | AC_DEFINE(USE_PIPES) |
147 | AC_DEFINE(LOGIN_NO_ENDOPT) | 147 | AC_DEFINE(LOGIN_NO_ENDOPT) |
148 | AC_DEFINE(LOGIN_NEEDS_UTMPX) | 148 | AC_DEFINE(LOGIN_NEEDS_UTMPX) |
149 | AC_DEFINE(DISABLE_SHADOW) | ||
150 | AC_DEFINE(DISABLE_UTMP) | 149 | AC_DEFINE(DISABLE_UTMP) |
151 | AC_DEFINE(LOCKED_PASSWD_STRING, "*") | 150 | AC_DEFINE(LOCKED_PASSWD_STRING, "*") |
152 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) | 151 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) |
@@ -163,7 +162,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
163 | AC_DEFINE(USE_PIPES) | 162 | AC_DEFINE(USE_PIPES) |
164 | AC_DEFINE(LOGIN_NO_ENDOPT) | 163 | AC_DEFINE(LOGIN_NO_ENDOPT) |
165 | AC_DEFINE(LOGIN_NEEDS_UTMPX) | 164 | AC_DEFINE(LOGIN_NEEDS_UTMPX) |
166 | AC_DEFINE(DISABLE_SHADOW) | ||
167 | AC_DEFINE(DISABLE_UTMP) | 165 | AC_DEFINE(DISABLE_UTMP) |
168 | AC_DEFINE(LOCKED_PASSWD_STRING, "*") | 166 | AC_DEFINE(LOCKED_PASSWD_STRING, "*") |
169 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) | 167 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) |
@@ -177,7 +175,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | |||
177 | AC_DEFINE(USE_PIPES) | 175 | AC_DEFINE(USE_PIPES) |
178 | AC_DEFINE(LOGIN_NO_ENDOPT) | 176 | AC_DEFINE(LOGIN_NO_ENDOPT) |
179 | AC_DEFINE(LOGIN_NEEDS_UTMPX) | 177 | AC_DEFINE(LOGIN_NEEDS_UTMPX) |
180 | AC_DEFINE(DISABLE_SHADOW) | ||
181 | AC_DEFINE(DISABLE_UTMP) | 178 | AC_DEFINE(DISABLE_UTMP) |
182 | AC_DEFINE(LOCKED_PASSWD_STRING, "*") | 179 | AC_DEFINE(LOCKED_PASSWD_STRING, "*") |
183 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) | 180 | AC_DEFINE(SPT_TYPE,SPT_PSTAT) |
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index 5b5d69c72..a0fe6c620 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c | |||
@@ -104,10 +104,6 @@ shadow_pw(struct passwd *pw) | |||
104 | 104 | ||
105 | if (spw != NULL) | 105 | if (spw != NULL) |
106 | pw_password = spw->ufld.fd_encrypt; | 106 | pw_password = spw->ufld.fd_encrypt; |
107 | # elif defined(__hpux) && !defined(HAVE_SECUREWARE) | ||
108 | struct pr_passwd *spw; | ||
109 | if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL) | ||
110 | pw_password = spw->ufld.fd_encrypt; | ||
111 | # endif | 107 | # endif |
112 | 108 | ||
113 | return pw_password; | 109 | return pw_password; |