diff options
author | Tim Rice <tim@multitalents.net> | 2007-03-26 09:35:28 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2007-03-26 09:35:28 -0700 |
commit | 99203ec48b030f121511cd785acaf9f47760ad72 (patch) | |
tree | 36575e610e6673c9e8d76837509b9c3236a4b806 /auth.c | |
parent | 20e9f976c16f98f3106f2dc298421a4a8c1ca8d7 (diff) |
20070326
- (tim) [auth.c configure.ac defines.h session.c openbsd-compat/port-uw.c
openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] Rework libiaf test/defines
to account for IRIX having libiaf but not set_id(). Patch with & ok dtucker@
Diffstat (limited to 'auth.c')
-rw-r--r-- | auth.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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); |