merged OpenSSH 4.2p1 to trunk

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

diff --git a/openssh/openbsd-compat/xcrypt.c b/openssh/openbsd-compat/xcrypt.c
index c3cea3c8689381e4face6b2eac19b015728b43b1..9afa0b9f268a77966e3437e3d097b1d83c6c52b6 100644 (file)
--- a/openssh/openbsd-compat/xcrypt.c
+++ b/openssh/openbsd-compat/xcrypt.c
@@ -93,6 +93,11 @@ shadow_pw(struct passwd *pw)
        if (spw != NULL)
                pw_password = spw->sp_pwdp;
 # 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)