Index: auth-passwd.c
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth-passwd.c,v
retrieving revision 1.68
diff -u -p -r1.68 auth-passwd.c
--- auth-passwd.c	6 Feb 2004 05:38:16 -0000	1.68
+++ auth-passwd.c	6 Feb 2004 05:59:00 -0000
@@ -75,13 +75,6 @@ auth_password(Authctxt *authctxt, const 
 	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);
@@ -127,6 +120,12 @@ sys_auth_passwd(Authctxt *authctxt, cons
 {
 	return (aix_authenticate(authctxt->pw->pw_name, password,
 	    get_canonical_hostname(options.use_dns)));
+}
+#elif defined(HAVE_OSF_SIA)
+int
+sys_auth_passwd(Authctxt *authctxt, const char *password)
+{
+	return auth_sia_password(authctxt, password);
 }
 #else
 int
