- (dtucker) [auth-passwd.c auth.h openbsd-compat/port-aix.c
    openbsd-compat/port-aix.h] Bug #14: Use do_pwchange to support AIX's
    native password expiry.
diff --git a/auth-passwd.c b/auth-passwd.c
index 5cc8815..a58dc04 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -43,14 +43,11 @@
 #include "servconf.h"
 #include "auth.h"
 #include "auth-options.h"
-#ifdef WITH_AIXAUTHENTICATE
-# include "canohost.h"
-#endif
 
 extern ServerOptions options;
 int sys_auth_passwd(Authctxt *, const char *);
 
-static void
+void
 disable_forwarding(void)
 {
 	no_port_forwarding_flag = 1;
@@ -121,14 +118,7 @@
 		return (auth_close(as));
 	}
 }
-#elif defined(WITH_AIXAUTHENTICATE)
-int
-sys_auth_passwd(Authctxt *authctxt, const char *password)
-{
-	return (aix_authenticate(authctxt->pw->pw_name, password,
-	    get_canonical_hostname(options.use_dns)));
-}
-#else
+#elif !defined(CUSTOM_SYS_AUTH_PASSWD)
 int
 sys_auth_passwd(Authctxt *authctxt, const char *password)
 {