diff options
| author | Damien Miller <djm@mindrot.org> | 2000-07-01 04:56:09 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-07-01 04:56:09 +0200 |
| commit | d8cfda6bf6db6db50a4f644ad39138b7f1e3e33f (patch) | |
| tree | 2f439dce13be17ee153ca5d9f8174b0a73faa717 /auth1.c | |
| parent | - (djm) Added patch from Chris Adams <cmadams@hiwaay.net> to add OSF SIA (diff) | |
| download | openssh-d8cfda6bf6db6db50a4f644ad39138b7f1e3e33f.tar.xz openssh-d8cfda6bf6db6db50a4f644ad39138b7f1e3e33f.zip | |
- (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu>
Diffstat (limited to 'auth1.c')
| -rw-r--r-- | auth1.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -310,7 +310,6 @@ do_authloop(struct passwd * pw) authenticated = auth_pam_password(pw, password); #elif defined(HAVE_OSF_SIA) /* Do SIA auth with password */ - host = get_canonical_hostname(); if (sia_validate_user(NULL, saved_argc, saved_argv, get_canonical_hostname(), pw->pw_name, NULL, 0, NULL, password) == SIASUCCESS) { @@ -505,7 +504,11 @@ do_authentication() #endif /* KRB4 */ #ifdef USE_PAM auth_pam_password(pw, "")) { -#else /* USE_PAM */ +#elif defined(HAVE_OSF_SIA) + (sia_validate_user(NULL, saved_argc, saved_argv, + get_canonical_hostname(), pw->pw_name, NULL, 0, NULL, + "") == SIASUCCESS)) { +#else /* !HAVE_OSF_SIA && !USE_PAM */ auth_password(pw, "")) { #endif /* USE_PAM */ /* Authentication with empty password succeeded. */ |