From 32030553139d9993d6b36e69f82b45f90023adcf Mon Sep 17 00:00:00 2001
From: pier11 <pier11@operamail.com>
Date: Mon, 29 Mar 2010 14:18:36 +0100
Subject: [PATCH] Kerberos: fix config in SIPE again It's not funny really.
 Kerberos became disabled.

---
 src/core/http-conn.c | 10 +++++-----
 src/core/sipe.c      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/core/http-conn.c b/src/core/http-conn.c
index f345df48..7a6af2df 100644
--- a/src/core/http-conn.c
+++ b/src/core/http-conn.c
@@ -579,7 +579,7 @@ http_conn_process_input_message(HttpConn *http_conn,
 	else if (msg->response == 401) {
 		char *ptmp;
 #ifdef _WIN32
-#ifdef HAVE_KERBEROS
+#ifdef HAVE_LIBKRB5
 		char *tmp;
 #endif
 #endif
@@ -604,7 +604,7 @@ http_conn_process_input_message(HttpConn *http_conn,
 		auth_type = AUTH_TYPE_NTLM;
 		auth_name = "NTLM";
 #ifdef _WIN32
-#ifdef HAVE_KERBEROS
+#ifdef HAVE_LIBKRB5
 		tmp = sipmsg_find_auth_header(msg, "Negotiate");
 		if (tmp && http_conn->auth && http_conn->auth->use_negotiate) {
 			ptmp = tmp;
@@ -616,11 +616,11 @@ http_conn_process_input_message(HttpConn *http_conn,
 		if (!ptmp) {
 			SIPE_DEBUG_INFO("http_conn_process_input_message: Only %s supported in the moment, exiting",
 #ifdef _WIN32
-#ifdef HAVE_KERBEROS
+#ifdef HAVE_LIBKRB5
 				"NTLM and Negotiate authentications are"
-#else /* !HAVE_KERBEROS */
+#else /* !HAVE_LIBKRB5 */
 				"NTLM authentication is"
-#endif /* HAVE_KERBEROS */
+#endif /* HAVE_LIBKRB5 */
 #else /* !_WIN32 */
 				"NTLM authentication is"
 #endif /* _WIN32 */
diff --git a/src/core/sipe.c b/src/core/sipe.c
index 4924ba50..0023912a 100644
--- a/src/core/sipe.c
+++ b/src/core/sipe.c
@@ -859,7 +859,7 @@ static void sign_outgoing_message (struct sipmsg * msg, struct sipe_account_data
 	} else if (sipe_strequal(method,"SUBSCRIBE") || sipe_strequal(method,"SERVICE") || sipe_strequal(method,"MESSAGE") || sipe_strequal(method,"INVITE") || sipe_strequal(method, "ACK") || sipe_strequal(method, "NOTIFY") || sipe_strequal(method, "BYE") || sipe_strequal(method, "INFO") || sipe_strequal(method, "OPTIONS") || sipe_strequal(method, "REFER")) {
 		sip->registrar.nc = 3;
 		sip->registrar.type = AUTH_TYPE_NTLM;
-#ifdef HAVE_KERBEROS
+#ifdef HAVE_LIBKRB5
 		if (purple_account_get_bool(sip->account, "krb5", FALSE)) {
 			sip->registrar.type = AUTH_TYPE_KERBEROS;
 		}
@@ -5607,7 +5607,7 @@ static const char*
 sipe_get_auth_scheme_name(struct sipe_account_data *sip)
 {
 	const char *res = "NTLM";
-#ifdef HAVE_KERBEROS
+#ifdef HAVE_LIBKRB5
 	if (purple_account_get_bool(sip->account, "krb5", FALSE)) {
 		res = "Kerberos";
 	}
-- 
2.11.4.GIT