Import of OpenSSH 5.2p1

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

diff --git a/openssh/openbsd-compat/xcrypt.c b/openssh/openbsd-compat/xcrypt.c
index c3cea3c8689381e4face6b2eac19b015728b43b1..6291e2884c5c266478ff1a5733b8bedb1260eeab 100644 (file)
--- a/openssh/openbsd-compat/xcrypt.c
+++ b/openssh/openbsd-compat/xcrypt.c
@@ -24,7 +24,11 @@
 
 #include "includes.h"
 
-# ifdef HAVE_CRYPT_H
+#include <sys/types.h>
+#include <unistd.h>
+#include <pwd.h>
+
+# if defined(HAVE_CRYPT_H) && !defined(HAVE_SECUREWARE)
 #  include <crypt.h>
 # endif
 
@@ -93,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)