Import of OpenSSH 5.2p1

[gssapi-openssh.git] / openssh / openbsd-compat / port-uw.c

diff --git a/openssh/openbsd-compat/port-uw.c b/openssh/openbsd-compat/port-uw.c
index c644271218a84c87fca9413326b3be0c2c712961..be9905a6af9b1b3fb3be504565dbfaec650db2b3 100644 (file)
--- a/openssh/openbsd-compat/port-uw.c
+++ b/openssh/openbsd-compat/port-uw.c
@@ -25,16 +25,27 @@
 
 #include "includes.h"
 
-#ifdef HAVE_LIBIAF
+#if defined(HAVE_LIBIAF)  &&  !defined(HAVE_SECUREWARE)
+#include <sys/types.h>
 #ifdef HAVE_CRYPT_H
-#include <crypt.h>
+# include <crypt.h>
 #endif
+#include <pwd.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "xmalloc.h"
 #include "packet.h"
 #include "buffer.h"
+#include "auth-options.h"
 #include "log.h"
 #include "servconf.h"
+#include "key.h"
+#include "hostfile.h"
 #include "auth.h"
-#include "auth-options.h"
+#include "ssh.h"
 
 int nischeck(char *);
 
@@ -68,7 +79,7 @@ sys_auth_passwd(Authctxt *authctxt, const char *password)
 #endif /* UNIXWARE_LONG_PASSWORDS */
                result = (strcmp(xcrypt(password, salt), pw_password) == 0);
 
-#if !defined(BROKEN_LIBIAF)
+#ifdef USE_LIBIAF
        if (authctxt->valid)
                free(pw_password);
 #endif
@@ -116,7 +127,7 @@ nischeck(char *namep)
        functions that call shadow_pw() will need to free
  */
 
-#if !defined(BROKEN_LIBIAF)
+#ifdef USE_LIBIAF
 char *
 get_iaf_password(struct passwd *pw)
 {
@@ -133,6 +144,6 @@ get_iaf_password(struct passwd *pw)
        else
                fatal("ia_openinfo: Unable to open the shadow passwd file");
 }
-#endif /* !BROKEN_LIBIAF */
-#endif /* HAVE_LIBIAF */
+#endif /* USE_LIBIAF */
+#endif /* HAVE_LIBIAF and not HAVE_SECUREWARE */