Blame SOURCES/openchange-2.3-samba-4.13.patch

48020f
diff -up openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c.samba-4.13 openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c
48020f
--- openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c.samba-4.13	2020-11-13 13:37:00.953428673 +0100
48020f
+++ openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c	2020-11-13 13:38:36.541453531 +0100
48020f
@@ -753,7 +753,7 @@ _PUBLIC_ enum MAPISTATUS OpenProfile(str
48020f
 _PUBLIC_ enum MAPISTATUS LoadProfile(struct mapi_context *mapi_ctx, 
48020f
 				     struct mapi_profile *profile)
48020f
 {
48020f
-	enum credentials_use_kerberos use_krb = CRED_AUTO_USE_KERBEROS;
48020f
+	enum credentials_use_kerberos use_krb = CRED_USE_KERBEROS_DESIRED;
48020f
 
48020f
 	/* Sanity checks */
48020f
 	OPENCHANGE_RETVAL_IF(!mapi_ctx, MAPI_E_NOT_INITIALIZED, NULL);
48020f
@@ -777,9 +777,9 @@ _PUBLIC_ enum MAPISTATUS LoadProfile(str
48020f
 	 * another API in the profile */
48020f
 	if (profile->kerberos) {
48020f
 		if (!strncmp(profile->kerberos, "yes", 3)) {
48020f
-			use_krb = CRED_MUST_USE_KERBEROS;
48020f
+			use_krb = CRED_USE_KERBEROS_REQUIRED;
48020f
 		} else {
48020f
-			use_krb = CRED_DONT_USE_KERBEROS;
48020f
+			use_krb = CRED_USE_KERBEROS_DISABLED;
48020f
 		}
48020f
 	}
48020f
 	/* additionally, don't set the username in the ccache if kerberos
48020f
@@ -787,13 +787,13 @@ _PUBLIC_ enum MAPISTATUS LoadProfile(str
48020f
 	 * credentials.  cli_credentials_guess probably gets the right
48020f
 	 * thing anyway in the situations where kerberos is in use */
48020f
 	if (profile->username && *(profile->username)
48020f
-	    && use_krb != CRED_MUST_USE_KERBEROS) {
48020f
+	    && use_krb != CRED_USE_KERBEROS_REQUIRED) {
48020f
 		cli_credentials_set_username(profile->credentials, profile->username, CRED_SPECIFIED);
48020f
 	}
48020f
 	if (profile->password && *(profile->password)) {
48020f
 		cli_credentials_set_password(profile->credentials, profile->password, CRED_SPECIFIED);
48020f
 	}
48020f
-	if (use_krb != CRED_AUTO_USE_KERBEROS) {
48020f
+	if (use_krb != CRED_USE_KERBEROS_DESIRED) {
48020f
 		cli_credentials_set_kerberos_state(profile->credentials, use_krb);
48020f
 	}
48020f