summaryrefslogtreecommitdiff
path: root/openbsd-compat/xcrypt.c
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2005-08-31 09:59:49 -0700
committerTim Rice <tim@multitalents.net>2005-08-31 09:59:49 -0700
commit66fd217e8e57f0c86179d77dc14e42efd3098320 (patch)
tree647dc150f96b27987211df1c77879111e0f0eac9 /openbsd-compat/xcrypt.c
parentd0a47cd2435abdbb4aaabbdd408e855431ce9ccd (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.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index 45320327..9afa0b9f 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -91,12 +91,13 @@ shadow_pw(struct passwd *pw)
struct spwd *spw = getspnam(pw->pw_name);
if (spw != NULL)
-#ifdef HAVE_LIBIAF
- pw_password = get_iaf_password(pw);
-#else
pw_password = spw->sp_pwdp;
-#endif /* HAVE_LIBIAF */
# endif
+
+#if defined(HAVE_LIBIAF) && !defined(BROKEN_LIBIAF)
+ return(get_iaf_password(pw));
+#endif
+
# if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
struct passwd_adjunct *spw;
if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL)