- (dtucker) [configure.ac openbsd-compat/glob.{c,h}] Bug #1407: force use of

[openssh.git] / openbsd-compat / xcrypt.c

diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index 453203270657c603fc349df4016b893b690ddbad..d8636bb398e107da73820616002f014d07d5445c 100644 (file)
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -24,6 +24,10 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#include <unistd.h>
+#include <pwd.h>
+
 # ifdef HAVE_CRYPT_H
 #  include <crypt.h>
 # endif
@@ -91,12 +95,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
+
+#ifdef USE_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)