From: Damien Miller <djm@mindrot.org>
Date: Mon, 1 May 2000 12:55:23 +0000 (+1000)
Subject:  - Add some missing ifdefs to auth2.c
X-Git-Tag: V_2_0_0_BETA1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cead2c02c6fa353594228adb1dea20c9a4e034f;p=thirdparty%2Fopenssh-portable.git

 - Add some missing ifdefs to auth2.c
---

diff --git a/ChangeLog b/ChangeLog
index d48430a50..9aedc60aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
    <andre.lucas@dial.pipex.com>
  - Merged bsd-login ttyslot and AIX utmp patch from Gert Doering
    <gd@hilb1.medat.de>
+ - Add some missing ifdefs to auth2.c
 
 20000430
  - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au>
diff --git a/auth2.c b/auth2.c
index cfe63cdf1..34a5f482d 100644
--- a/auth2.c
+++ b/auth2.c
@@ -93,8 +93,12 @@ void
 do_authentication2()
 {
 	/* turn off skey/kerberos, not supported by SSH2 */
+#ifdef SKEY
 	options.skey_authentication = 0;
+#endif
+#ifdef KRB4
 	options.kerberos_authentication = 0;
+#endif
 
 	dispatch_init(&protocol_error);
 	dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request);