Script to turn plain man pages into html now that we want to make html man

[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 6f3523902590c90fe78e30cf46e1bda104b407d0..d881ff028dddee81ca747fff76e614084f5008f8 100644 (file)
--- a/openssh/openbsd-compat/port-uw.c
+++ b/openssh/openbsd-compat/port-uw.c
@@ -25,27 +25,16 @@
 
 #include "includes.h"
 
-#ifdef HAVE_LIBIAF
-#include <sys/types.h>
+#if defined(HAVE_LIBIAF)  &&  !defined(BROKEN_LIBIAF)
 #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 "ssh.h"
+#include "auth-options.h"
 
 int nischeck(char *);
 
@@ -53,6 +42,7 @@ int
 sys_auth_passwd(Authctxt *authctxt, const char *password)
 {
        struct passwd *pw = authctxt->pw;
+       char *encrypted_password;
        char *salt;
        int result;
 
@@ -65,24 +55,21 @@ sys_auth_passwd(Authctxt *authctxt, const char *password)
 
        /* Encrypt the candidate password using the proper salt. */
        salt = (pw_password[0] && pw_password[1]) ? pw_password : "xx";
+#ifdef UNIXWARE_LONG_PASSWORDS
+       if (!nischeck(pw->pw_name))
+               encrypted_password = bigcrypt(password, salt);
+       else
+#endif /* UNIXWARE_LONG_PASSWORDS */
+               encrypted_password = xcrypt(password, salt);
 
        /*
         * Authentication is accepted if the encrypted passwords
         * are identical.
         */
-#ifdef UNIXWARE_LONG_PASSWORDS
-       if (!nischeck(pw->pw_name)) {
-               result = ((strcmp(bigcrypt(password, salt), pw_password) == 0)
-               ||  (strcmp(osr5bigcrypt(password, salt), pw_password) == 0));
-       }
-       else
-#endif /* UNIXWARE_LONG_PASSWORDS */
-               result = (strcmp(xcrypt(password, salt), pw_password) == 0);
+       result = (strcmp(encrypted_password, pw_password) == 0);
 
-#if !defined(BROKEN_LIBIAF)
        if (authctxt->valid)
                free(pw_password);
-#endif
        return(result);
 }
 
@@ -127,7 +114,6 @@ nischeck(char *namep)
        functions that call shadow_pw() will need to free
  */
 
-#if !defined(BROKEN_LIBIAF)
 char *
 get_iaf_password(struct passwd *pw)
 {
@@ -144,6 +130,5 @@ get_iaf_password(struct passwd *pw)
        else
                fatal("ia_openinfo: Unable to open the shadow passwd file");
 }
-#endif /* !BROKEN_LIBIAF */
-#endif /* HAVE_LIBIAF */
+#endif /* HAVE_LIBIAF  && !BROKEN_LIBIAF */