From b98faaa8c0c5f2f8d0a1d4301be4b5d9950c98ee Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 11 Feb 2005 22:50:57 +0000 Subject: [PATCH] Fixed bad krb4 code. It always tried to use krb4 if built enabled. --- lib/ftp.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/ftp.c b/lib/ftp.c index 82683aa..fc73edc 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -2154,21 +2154,23 @@ static CURLcode ftp_state_loggedin(struct connectdata *conn) infof(data, "We have successfully logged in\n"); #ifdef HAVE_KRB4 - /* We are logged in with Kerberos, now set the requested - * protection level - */ - if(conn->sec_complete) - /* BLOCKING */ - Curl_sec_set_protection_level(conn); - - /* We may need to issue a KAUTH here to have access to the files - * do it if user supplied a password - */ - if(conn->passwd && *conn->passwd) { - /* BLOCKING */ - result = Curl_krb_kauth(conn); - if(result) - return result; + if(data->set.krb4) { + /* We are logged in, asked to use Kerberos. Set the requested + * protection level + */ + if(conn->sec_complete) + /* BLOCKING */ + Curl_sec_set_protection_level(conn); + + /* We may need to issue a KAUTH here to have access to the files + * do it if user supplied a password + */ + if(conn->passwd && *conn->passwd) { + /* BLOCKING */ + result = Curl_krb_kauth(conn); + if(result) + return result; + } } #endif if(conn->ssl[FIRSTSOCKET].use) { -- 2.7.4