import openchange-2.3-27.el8

This commit is contained in:
CentOS Sources 2021-05-18 02:37:53 -04:00 committed by Andrew Lukoshko
parent f73a09f728
commit b5f8f68dc9
2 changed files with 46 additions and 1 deletions

View File

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

View File

@ -23,7 +23,7 @@
Name: openchange
Version: 2.3
Release: 26%{?dist}
Release: 27%{?dist}
Group: Applications/System
Summary: Provides access to Microsoft Exchange servers using native protocols
License: GPLv3+ and Public Domain
@ -94,6 +94,7 @@ Patch15: openchange-2.3-samba-4.10-macros.patch
Patch16: openchange-2.3-samba-4.11.patch
Patch17: openchange-2.3-samba-4.11.2.patch
Patch18: openchange-2.3-samba-4.12.patch
Patch19: openchange-2.3-samba-4.13.patch
%description
OpenChange provides libraries to access Microsoft Exchange servers
@ -174,6 +175,7 @@ This package provides the server elements for OpenChange.
%patch16 -p1 -b .samba-4.11
%patch17 -p1 -b .samba-4.11.2
%patch18 -p1 -b .samba-4.12
%patch19 -p1 -b .samba-4.13
%build
./autogen.sh
@ -322,6 +324,9 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan
%endif
%changelog
* Fri Nov 13 2020 Milan Crha <mcrha@redhat.com> - 2.3-27
- Rebuild for newer samba
* Mon Jun 08 2020 Milan Crha <mcrha@redhat.com> - 2.3-26
- Add patch to build against samba 4.12