diff options
author | Tim Rice <tim@multitalents.net> | 2005-08-31 09:59:49 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2005-08-31 09:59:49 -0700 |
commit | 66fd217e8e57f0c86179d77dc14e42efd3098320 (patch) | |
tree | 647dc150f96b27987211df1c77879111e0f0eac9 /openbsd-compat/xcrypt.c | |
parent | d0a47cd2435abdbb4aaabbdd408e855431ce9ccd (diff) |
- (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c
openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] libiaf cleanup. Disable
libiaf bits for OpenServer6. Free memory allocated by ia_get_logpwd().
Feedback and OK dtucker@
Diffstat (limited to 'openbsd-compat/xcrypt.c')
-rw-r--r-- | openbsd-compat/xcrypt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index 453203270..9afa0b9f2 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c | |||
@@ -91,12 +91,13 @@ shadow_pw(struct passwd *pw) | |||
91 | struct spwd *spw = getspnam(pw->pw_name); | 91 | struct spwd *spw = getspnam(pw->pw_name); |
92 | 92 | ||
93 | if (spw != NULL) | 93 | if (spw != NULL) |
94 | #ifdef HAVE_LIBIAF | ||
95 | pw_password = get_iaf_password(pw); | ||
96 | #else | ||
97 | pw_password = spw->sp_pwdp; | 94 | pw_password = spw->sp_pwdp; |
98 | #endif /* HAVE_LIBIAF */ | ||
99 | # endif | 95 | # endif |
96 | |||
97 | #if defined(HAVE_LIBIAF) && !defined(BROKEN_LIBIAF) | ||
98 | return(get_iaf_password(pw)); | ||
99 | #endif | ||
100 | |||
100 | # if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) | 101 | # if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) |
101 | struct passwd_adjunct *spw; | 102 | struct passwd_adjunct *spw; |
102 | if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL) | 103 | if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL) |