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