- (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@

1 files changed, 5 insertions, 2 deletions

diff --git a/auth.c b/auth.c
index d62d8ff22..2dc5c2be6 100644
--- a/auth.c
+++ b/auth.c
@@ -97,11 +97,11 @@ allowed_user(struct passwd * pw)
         /* grab passwd field for locked account check */
 #ifdef USE_SHADOW
         if (spw != NULL)
-#ifdef HAVE_LIBIAF
+#if defined(HAVE_LIBIAF)  &&  !defined(BROKEN_LIBIAF)
                 passwd = get_iaf_password(pw);
 #else
                 passwd = spw->sp_pwdp;
-#endif /* HAVE_LIBIAF */
+#endif /* HAVE_LIBIAF  && !BROKEN_LIBIAF */
 #else
         passwd = pw->pw_passwd;
 #endif
@@ -123,6 +123,9 @@ allowed_user(struct passwd * pw)
                 if (strstr(passwd, LOCKED_PASSWD_SUBSTR))
                         locked = 1;
 #endif
+#if defined(HAVE_LIBIAF)  &&  !defined(BROKEN_LIBIAF)
+                free(passwd);
+#endif /* HAVE_LIBIAF  && !BROKEN_LIBIAF */
                 if (locked) {
                         logit("User %.100s not allowed because account is locked",
                             pw->pw_name);