1 files changed, 3 insertions, 18 deletions

diff --git a/auth2-chall.c b/auth2-chall.c
index aacbf0bcc..0d1709307 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -41,9 +41,6 @@ static void input_userauth_info_response(int, u_int32_t, void *);
 #ifdef BSD_AUTH
 extern KbdintDevice bsdauth_device;
 #else
-#ifdef USE_PAM
-extern KbdintDevice sshpam_device;
-#endif
 #ifdef SKEY
 extern KbdintDevice skey_device;
 #endif
@@ -53,9 +50,6 @@ KbdintDevice *devices[] = {
 #ifdef BSD_AUTH
         &bsdauth_device,
 #else
-#ifdef USE_PAM
-        &sshpam_device,
-#endif
 #ifdef SKEY
         &skey_device,
 #endif
@@ -326,27 +320,18 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
 void
 privsep_challenge_enable(void)
 {
-#if defined(BSD_AUTH) || defined(USE_PAM) || defined(SKEY)
-        int n = 0;
-#endif
 #ifdef BSD_AUTH
         extern KbdintDevice mm_bsdauth_device;
 #endif
-#ifdef USE_PAM
-        extern KbdintDevice mm_sshpam_device;
-#endif
 #ifdef SKEY
         extern KbdintDevice mm_skey_device;
 #endif
-
+        /* As long as SSHv1 has devices[0] hard coded this is fine */
 #ifdef BSD_AUTH
-        devices[n++] = &mm_bsdauth_device;
+        devices[0] = &mm_bsdauth_device;
 #else
-#ifdef USE_PAM
-        devices[n++] = &mm_sshpam_device;
-#endif
 #ifdef SKEY
-        devices[n++] = &mm_skey_device;
+        devices[0] = &mm_skey_device;
 #endif
 #endif
 }