- (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 a0fe6c62009d0a433b70998a4daee349831c0a1c..d8636bb398e107da73820616002f014d07d5445c 100644 (file)
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -24,7 +24,9 @@
 
 #include "includes.h"
 
-#if !defined(HAVE_OSF_SIA)
+#include <sys/types.h>
+#include <unistd.h>
+#include <pwd.h>
 
 # ifdef HAVE_CRYPT_H
 #  include <crypt.h>
@@ -95,6 +97,11 @@ shadow_pw(struct passwd *pw)
        if (spw != NULL)
                pw_password = spw->sp_pwdp;
 # 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)
@@ -108,5 +115,3 @@ shadow_pw(struct passwd *pw)
 
        return pw_password;
 }
-
-#endif /* !defined(HAVE_OSF_SIA) */