[evolution-mapi/gnome-3-4] Explicitly enable/disable kerberos in MAPI profile

[Milan Crha <mcrha src gnome org>]

commit 7f396e041721dbc5f4df4f2ede400765a9d42a8b
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 17 11:08:20 2012 +0200

    Explicitly enable/disable kerberos in MAPI profile
    
    It's to not even try kerberos authentication when not enabled in
    an account, because the previous code left the kerberos login on
    an "auto" mode, which eventually could try kerberos login.
    New code avoids this "auto" mode.
    
    Note, to take into effect, the account re-authentication is required.

 src/libexchangemapi/e-mapi-connection.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c
index 0cda118..fa0cbcb 100644
--- a/src/libexchangemapi/e-mapi-connection.c
+++ b/src/libexchangemapi/e-mapi-connection.c
@@ -6604,14 +6604,12 @@ mapi_profile_create (struct mapi_context *mapi_ctx,
 
 	add_string_attr (profname, "binding", empd->server);
 	add_string_attr (profname, "workstation", workstation);
+	add_string_attr (profname, "kerberos", empd->krb_sso ? "yes" : "no");
 
-	if (empd->krb_sso) {
-		/* note: domain and realm are intentially not added to
-		 *       the libmapi profile in the case of SSO enabled,
-		 *       as it changes the behavior, and breaks SSO support. */
-		add_string_attr (profname, "kerberos", "yes");
-	} else {
-		/* only add domain if !kerberos SSO */
+	/* note: domain and realm are intentially not added to
+	 *       the libmapi profile in the case of SSO enabled,
+	 *       as it changes the behavior, and breaks SSO support. */
+	if (!empd->krb_sso) {
 		add_string_attr (profname, "domain", empd->domain);
 	}