summaryrefslogtreecommitdiff
path: root/auth-passwd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-01-23 10:32:03 +1100
committerDamien Miller <djm@mindrot.org>2000-01-23 10:32:03 +1100
commit1fa154bb1e06bfb4f8d6b95f09a6352d38577c57 (patch)
tree62678a152fab75d8062dff6eb85e72db6fb27acc /auth-passwd.c
parent6fe375dee4f0c5b81026d7eb9dc00cf75645b241 (diff)
- AIX patch from Matt Richards <v2matt@btv.ibm.com> and David Rankin
<drankin@bohemians.lexington.ky.us>
Diffstat (limited to 'auth-passwd.c')
-rw-r--r--auth-passwd.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/auth-passwd.c b/auth-passwd.c
index a8a52ce9a..278212aa5 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -11,13 +11,17 @@
11 11
12#ifndef USE_PAM 12#ifndef USE_PAM
13 13
14RCSID("$Id: auth-passwd.c,v 1.15 2000/01/06 01:03:13 damien Exp $"); 14RCSID("$Id: auth-passwd.c,v 1.16 2000/01/22 23:32:03 damien Exp $");
15 15
16#include "packet.h" 16#include "packet.h"
17#include "ssh.h" 17#include "ssh.h"
18#include "servconf.h" 18#include "servconf.h"
19#include "xmalloc.h" 19#include "xmalloc.h"
20 20
21#ifdef WITH_AIXAUTHENTICATE
22#include <login.h>
23#endif
24
21#ifdef HAVE_SHADOW_H 25#ifdef HAVE_SHADOW_H
22# include <shadow.h> 26# include <shadow.h>
23#endif 27#endif
@@ -39,6 +43,11 @@ auth_password(struct passwd * pw, const char *password)
39#ifdef HAVE_SHADOW_H 43#ifdef HAVE_SHADOW_H
40 struct spwd *spw; 44 struct spwd *spw;
41#endif 45#endif
46#ifdef WITH_AIXAUTHENTICATE
47 char *authmsg;
48 char *loginmsg;
49 int reenter = 1;
50#endif
42 51
43 /* deny if no user. */ 52 /* deny if no user. */
44 if (pw == NULL) 53 if (pw == NULL)
@@ -56,6 +65,11 @@ auth_password(struct passwd * pw, const char *password)
56 /* Fall back to ordinary passwd authentication. */ 65 /* Fall back to ordinary passwd authentication. */
57 } 66 }
58#endif 67#endif
68
69#ifdef WITH_AIXAUTHENTICATE
70 return (authenticate(pw->pw_name,password,&reenter,&authmsg) == 0);
71#endif
72
59#ifdef KRB4 73#ifdef KRB4
60 if (options.kerberos_authentication == 1) { 74 if (options.kerberos_authentication == 1) {
61 int ret = auth_krb4_password(pw, password); 75 int ret = auth_krb4_password(pw, password);