diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | auth2.c | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -18,6 +18,7 @@ | |||
18 | <andre.lucas@dial.pipex.com> | 18 | <andre.lucas@dial.pipex.com> |
19 | - Merged bsd-login ttyslot and AIX utmp patch from Gert Doering | 19 | - Merged bsd-login ttyslot and AIX utmp patch from Gert Doering |
20 | <gd@hilb1.medat.de> | 20 | <gd@hilb1.medat.de> |
21 | - Add some missing ifdefs to auth2.c | ||
21 | 22 | ||
22 | 20000430 | 23 | 20000430 |
23 | - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au> | 24 | - Merge HP-UX fixes and TCB support from Ged Lodder <lodder@yacc.com.au> |
@@ -93,8 +93,12 @@ void | |||
93 | do_authentication2() | 93 | do_authentication2() |
94 | { | 94 | { |
95 | /* turn off skey/kerberos, not supported by SSH2 */ | 95 | /* turn off skey/kerberos, not supported by SSH2 */ |
96 | #ifdef SKEY | ||
96 | options.skey_authentication = 0; | 97 | options.skey_authentication = 0; |
98 | #endif | ||
99 | #ifdef KRB4 | ||
97 | options.kerberos_authentication = 0; | 100 | options.kerberos_authentication = 0; |
101 | #endif | ||
98 | 102 | ||
99 | dispatch_init(&protocol_error); | 103 | dispatch_init(&protocol_error); |
100 | dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); | 104 | dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); |