- (dtucker) [auth-passwd.c auth-sia.c auth-sia.h defines.h

   openbsd-compat/xcrypt.c] Bug #802: Fix build error on Tru64 when
   configured --with-osfsia.  ok djm@

6 files changed, 14 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 981277d95..4895dffbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    -DUSE_POSIX_THREADS.  From antoine.verheijen at ualbert ca.  ok djm@
  - (dtucker) [auth-pam.c] Reset signal status when starting pam auth thread,
    prevent hanging during PAM keyboard-interactive authentications.  ok djm@
+ - (dtucker) [auth-passwd.c auth-sia.c auth-sia.h defines.h
+   openbsd-compat/xcrypt.c] Bug #802: Fix build error on Tru64 when
+   configured --with-osfsia.  ok djm@
 
 20040303
  - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent
@@ -851,4 +854,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3275 2004/03/04 09:03:54 dtucker Exp $
+$Id: ChangeLog,v 1.3276 2004/03/04 11:59:36 dtucker Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index b9679abd0..beaf0fa6c 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -73,13 +73,6 @@ auth_password(Authctxt *authctxt, const char *password)
         if (*password == '\0' && options.permit_empty_passwd == 0)
                 return 0;
 
-#if defined(HAVE_OSF_SIA)
-        /*
-         * XXX: any reason this is before krb?  could be moved to
-         * sys_auth_passwd()?  -dt
-         */
-        return auth_sia_password(authctxt, password) && ok;
-#endif
 #ifdef KRB5
         if (options.kerberos_authentication == 1) {
                 int ret = auth_krb5_password(authctxt, password);
diff --git a/auth-sia.c b/auth-sia.c
index cd2dcb840..63f55d07f 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -47,7 +47,7 @@ extern int saved_argc;
 extern char **saved_argv;
 
 int
-auth_sia_password(Authctxt *authctxt, char *pass)
+sys_auth_passwd(Authctxt *authctxt, char *pass)
 {
         int ret;
         SIAENTITY *ent = NULL;
diff --git a/auth-sia.h b/auth-sia.h
index 38164ff81..ca55e913e 100644
--- a/auth-sia.h
+++ b/auth-sia.h
@@ -26,7 +26,7 @@
 
 #ifdef HAVE_OSF_SIA
 
-int     auth_sia_password(Authctxt *, char *);
+int     sys_auth_passwd(Authctxt *, char *);
 void    session_setup_sia(struct passwd *, char *);
 
 #endif /* HAVE_OSF_SIA */
diff --git a/defines.h b/defines.h
index 5e1cac7bc..20575a276 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.110 2004/02/10 02:01:14 dtucker Exp $ */
+/* $Id: defines.h,v 1.111 2004/03/04 11:59:37 dtucker Exp $ */
 
 
 /* Constants */
@@ -616,6 +616,13 @@ struct winsize {
 #  define USE_LASTLOG
 #endif
 
+#ifdef HAVE_OSF_SIA
+# ifdef USE_SHADOW
+#  undef USE_SHADOW
+# endif
+# define CUSTOM_SYS_AUTH_PASSWD 1
+#endif
+
 /** end of login recorder definitions */
 
 #endif /* _DEFINES_H */
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index a0fe6c620..c3cea3c86 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -24,8 +24,6 @@
 
 #include "includes.h"
 
-#if !defined(HAVE_OSF_SIA)
-
 # ifdef HAVE_CRYPT_H
 #  include <crypt.h>
 # endif
@@ -108,5 +106,3 @@ shadow_pw(struct passwd *pw)
 
         return pw_password;
 }
-
-#endif /* !defined(HAVE_OSF_SIA) */