diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-01 02:05:26 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-01 02:05:26 +0000 |
commit | 6d5a72bc1d98a42ba42f082e50a22e911c1d82d3 (patch) | |
tree | 1bf23174bdb6fc71e2846dda0eca195a418484e7 /auth-passwd.c | |
parent | 2ee26b431f98cf1dc0e4fb9809ad1e0c879b8c08 (diff) | |
parent | 58657d96514cd6f16d82add8d6f4adbb36765758 (diff) |
Debian release 3.5p1-1.
Diffstat (limited to 'auth-passwd.c')
-rw-r--r-- | auth-passwd.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/auth-passwd.c b/auth-passwd.c index 17bbd2ceb..185db7d6d 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -81,6 +81,9 @@ RCSID("$OpenBSD: auth-passwd.c,v 1.27 2002/05/24 16:45:16 stevesk Exp $"); | |||
81 | #endif /* !USE_PAM && !HAVE_OSF_SIA */ | 81 | #endif /* !USE_PAM && !HAVE_OSF_SIA */ |
82 | 82 | ||
83 | extern ServerOptions options; | 83 | extern ServerOptions options; |
84 | #ifdef WITH_AIXAUTHENTICATE | ||
85 | extern char *aixloginmsg; | ||
86 | #endif | ||
84 | 87 | ||
85 | /* | 88 | /* |
86 | * Tries to authenticate the user using password. Returns true if | 89 | * Tries to authenticate the user using password. Returns true if |
@@ -113,7 +116,7 @@ auth_password(Authctxt *authctxt, const char *password) | |||
113 | #endif | 116 | #endif |
114 | #ifdef WITH_AIXAUTHENTICATE | 117 | #ifdef WITH_AIXAUTHENTICATE |
115 | char *authmsg; | 118 | char *authmsg; |
116 | char *loginmsg; | 119 | int authsuccess; |
117 | int reenter = 1; | 120 | int reenter = 1; |
118 | #endif | 121 | #endif |
119 | 122 | ||
@@ -145,7 +148,16 @@ auth_password(Authctxt *authctxt, const char *password) | |||
145 | } | 148 | } |
146 | #endif | 149 | #endif |
147 | #ifdef WITH_AIXAUTHENTICATE | 150 | #ifdef WITH_AIXAUTHENTICATE |
148 | return (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0); | 151 | authsuccess = (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0); |
152 | |||
153 | if (authsuccess) | ||
154 | /* We don't have a pty yet, so just label the line as "ssh" */ | ||
155 | if (loginsuccess(authctxt->user, | ||
156 | get_canonical_hostname(options.verify_reverse_mapping), | ||
157 | "ssh", &aixloginmsg) < 0) | ||
158 | aixloginmsg = NULL; | ||
159 | |||
160 | return(authsuccess); | ||
149 | #endif | 161 | #endif |
150 | #ifdef KRB4 | 162 | #ifdef KRB4 |
151 | if (options.kerberos_authentication == 1) { | 163 | if (options.kerberos_authentication == 1) { |