summaryrefslogtreecommitdiff
path: root/auth.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-12-29 21:40:29 +0000
committerColin Watson <cjwatson@debian.org>2009-12-29 21:40:29 +0000
commita25ec0b132c44c9e341e08464ff830de06b81126 (patch)
treee20842d80f9e25cb6cf09525abea63f7bf655dd7 /auth.c
parent1b816ea846aca3ee89e7995373ace609e9518424 (diff)
parent70847d299887abb96f8703ca99db6d817b78960e (diff)
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'auth.c')
-rw-r--r--auth.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/auth.c b/auth.c
index 505102f8a..c1e0f4812 100644
--- a/auth.c
+++ b/auth.c
@@ -115,11 +115,11 @@ allowed_user(struct passwd * pw)
115 /* grab passwd field for locked account check */ 115 /* grab passwd field for locked account check */
116#ifdef USE_SHADOW 116#ifdef USE_SHADOW
117 if (spw != NULL) 117 if (spw != NULL)
118#if defined(HAVE_LIBIAF) && !defined(BROKEN_LIBIAF) 118#ifdef USE_LIBIAF
119 passwd = get_iaf_password(pw); 119 passwd = get_iaf_password(pw);
120#else 120#else
121 passwd = spw->sp_pwdp; 121 passwd = spw->sp_pwdp;
122#endif /* HAVE_LIBIAF && !BROKEN_LIBIAF */ 122#endif /* USE_LIBIAF */
123#else 123#else
124 passwd = pw->pw_passwd; 124 passwd = pw->pw_passwd;
125#endif 125#endif
@@ -141,9 +141,9 @@ allowed_user(struct passwd * pw)
141 if (strstr(passwd, LOCKED_PASSWD_SUBSTR)) 141 if (strstr(passwd, LOCKED_PASSWD_SUBSTR))
142 locked = 1; 142 locked = 1;
143#endif 143#endif
144#if defined(HAVE_LIBIAF) && !defined(BROKEN_LIBIAF) 144#ifdef USE_LIBIAF
145 free(passwd); 145 free(passwd);
146#endif /* HAVE_LIBIAF && !BROKEN_LIBIAF */ 146#endif /* USE_LIBIAF */
147 if (locked) { 147 if (locked) {
148 logit("User %.100s not allowed because account is locked", 148 logit("User %.100s not allowed because account is locked",
149 pw->pw_name); 149 pw->pw_name);