X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/51f1e7024fd6e7881a0a713868d67861ba97fbfb..fe53310bc2e7636f1dd16001684d0c5d936cd292:/openssh/openbsd-compat/xcrypt.c

diff --git a/openssh/openbsd-compat/xcrypt.c b/openssh/openbsd-compat/xcrypt.c
index 5b5d69c..6291e28 100644
--- a/openssh/openbsd-compat/xcrypt.c
+++ b/openssh/openbsd-compat/xcrypt.c
@@ -24,9 +24,11 @@
 
 #include "includes.h"
 
-#if !defined(HAVE_OSF_SIA)
+#include <sys/types.h>
+#include <unistd.h>
+#include <pwd.h>
 
-# ifdef HAVE_CRYPT_H
+# if defined(HAVE_CRYPT_H) && !defined(HAVE_SECUREWARE)
 #  include <crypt.h>
 # endif
 
@@ -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)
@@ -104,13 +111,7 @@ shadow_pw(struct passwd *pw)
 
 	if (spw != NULL)
 		pw_password = spw->ufld.fd_encrypt;
-# elif defined(__hpux) && !defined(HAVE_SECUREWARE)
-	struct pr_passwd *spw;
-        if (iscomsec() && (spw = getprpwnam(pw->pw_name)) != NULL)
-                pw_password = spw->ufld.fd_encrypt;
 # endif
 
 	return pw_password;
 }
-
-#endif /* !defined(HAVE_OSF_SIA) */