===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2-chall.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- src/usr.bin/ssh/auth2-chall.c	2007/01/03 03:01:40	1.32
+++ src/usr.bin/ssh/auth2-chall.c	2007/09/21 08:15:29	1.33
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.32 2007/01/03 03:01:40 stevesk Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.33 2007/09/21 08:15:29 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -43,22 +43,10 @@
 static int send_userauth_info_request(Authctxt *);
 static void input_userauth_info_response(int, u_int32_t, void *);
 
-#ifdef BSD_AUTH
 extern KbdintDevice bsdauth_device;
-#else
-#ifdef SKEY
-extern KbdintDevice skey_device;
-#endif
-#endif
 
 KbdintDevice *devices[] = {
-#ifdef BSD_AUTH
 	&bsdauth_device,
-#else
-#ifdef SKEY
-	&skey_device,
-#endif
-#endif
 	NULL
 };
 
@@ -319,19 +307,7 @@
 void
 privsep_challenge_enable(void)
 {
-#ifdef BSD_AUTH
 	extern KbdintDevice mm_bsdauth_device;
-#else
-#ifdef SKEY
-	extern KbdintDevice mm_skey_device;
-#endif
-#endif
 	/* As long as SSHv1 has devices[0] hard coded this is fine */
-#ifdef BSD_AUTH
 	devices[0] = &mm_bsdauth_device;
-#else
-#ifdef SKEY
-	devices[0] = &mm_skey_device;
-#endif
-#endif
 }