.openchange.metadata

@@ -0,0 +1 @@
+901e6d8fa4f9f4a1d41c3ad97d967da316d0ad17 SOURCES/openchange-2.3-VULCAN.tar.gz

SOURCES/openchange-2.3-samba-4.13.patch

@@ -1,40 +0,0 @@
-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);
- 	}
- 

SOURCES/openchange-2.3-samba-4.15.patch

@@ -1,103 +0,0 @@
-diff -up openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c.samba-4.15 openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c
---- openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c.samba-4.15	2021-07-19 12:26:37.615770488 +0200
-+++ openchange-openchange-2.3-VULCAN/libmapi/IProfAdmin.c	2021-07-19 12:26:39.640771957 +0200
-@@ -794,7 +794,7 @@ _PUBLIC_ enum MAPISTATUS LoadProfile(str
- 		cli_credentials_set_password(profile->credentials, profile->password, CRED_SPECIFIED);
- 	}
- 	if (use_krb != CRED_USE_KERBEROS_DESIRED) {
--		cli_credentials_set_kerberos_state(profile->credentials, use_krb);
-+		cli_credentials_set_kerberos_state(profile->credentials, use_krb, CRED_SPECIFIED);
- 	}
- 
- 	return MAPI_E_SUCCESS;
-diff -up openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.15 openchange-openchange-2.3-VULCAN/ndr_mapi.c
---- openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.15	2021-07-19 12:59:29.801210983 +0200
-+++ openchange-openchange-2.3-VULCAN/ndr_mapi.c	2021-07-19 13:07:49.382594567 +0200
-@@ -1235,15 +1235,18 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
- 	TALLOC_CTX	*_mem_save_rgbAuxOut_1;
- 
- 	if (flags & NDR_IN) {
-+		uint32_t array_length = 0, array_size = 0;
- 		OC_ZERO_STRUCT(r->out);
- 
- 		NDR_CHECK(ndr_pull_array_size(ndr, &r->in.szUserDN));
- 		NDR_CHECK(ndr_pull_array_length(ndr, &r->in.szUserDN));
--		if (ndr_get_array_length(ndr, &r->in.szUserDN) > ndr_get_array_size(ndr, &r->in.szUserDN)) {
--			return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.szUserDN), ndr_get_array_length(ndr, &r->in.szUserDN));
-+		NDR_CHECK(ndr_get_array_length(ndr, &r->in.szUserDN, &array_length));
-+		NDR_CHECK(ndr_get_array_size(ndr, &r->in.szUserDN, &array_size));
-+		if (array_length > array_size) {
-+			return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", array_size, array_length);
- 		}
--		NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.szUserDN), sizeof(uint8_t)));
--		NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.szUserDN, ndr_get_array_length(ndr, &r->in.szUserDN), sizeof(uint8_t), CH_DOS));
-+		NDR_CHECK(ndr_check_string_terminator(ndr, array_length, sizeof(uint8_t)));
-+		NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.szUserDN, array_length, sizeof(uint8_t), CH_DOS));
- 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.ulFlags));
- 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.ulConMod));
- 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.cbLimit));
-@@ -1317,6 +1320,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
- 	}
- 
- 	if (flags & NDR_OUT) {
-+		uint32_t array_length = 0, array_size = 0;
- 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
- 			NDR_PULL_ALLOC(ndr, r->out.handle);
- 		}
-@@ -1366,11 +1370,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
- 			NDR_PULL_SET_MEM_CTX(ndr, *r->out.szDNPrefix, 0);
- 			NDR_CHECK(ndr_pull_array_size(ndr, r->out.szDNPrefix));
- 			NDR_CHECK(ndr_pull_array_length(ndr, r->out.szDNPrefix));
--			if (ndr_get_array_length(ndr, r->out.szDNPrefix) > ndr_get_array_size(ndr, r->out.szDNPrefix)) {
--				return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, r->out.szDNPrefix), ndr_get_array_length(ndr, r->out.szDNPrefix));
-+			NDR_CHECK(ndr_get_array_length(ndr, r->out.szDNPrefix, &array_length));
-+			NDR_CHECK(ndr_get_array_size(ndr, r->out.szDNPrefix, &array_size));
-+			if (array_length > array_size) {
-+				return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", array_size, array_length);
- 			}
--			NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, r->out.szDNPrefix), sizeof(uint8_t)));
--			NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.szDNPrefix, ndr_get_array_length(ndr, r->out.szDNPrefix), sizeof(uint8_t), CH_DOS));
-+			NDR_CHECK(ndr_check_string_terminator(ndr, array_length, sizeof(uint8_t)));
-+			NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.szDNPrefix, array_length, sizeof(uint8_t), CH_DOS));
- 			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_szDNPrefix_1, 0);
- 		}
- 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_szDNPrefix_0, LIBNDR_FLAG_REF_ALLOC);
-@@ -1391,11 +1397,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
- 			NDR_PULL_SET_MEM_CTX(ndr, *r->out.szDisplayName, 0);
- 			NDR_CHECK(ndr_pull_array_size(ndr, r->out.szDisplayName));
- 			NDR_CHECK(ndr_pull_array_length(ndr, r->out.szDisplayName));
--			if (ndr_get_array_length(ndr, r->out.szDisplayName) > ndr_get_array_size(ndr, r->out.szDisplayName)) {
--				return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, r->out.szDisplayName), ndr_get_array_length(ndr, r->out.szDisplayName));
-+			NDR_CHECK(ndr_get_array_length(ndr, r->out.szDisplayName, &array_length));
-+			NDR_CHECK(ndr_get_array_size(ndr, r->out.szDisplayName, &array_size));
-+			if (array_length > array_size) {
-+				return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", array_size, array_length);
- 			}
--			NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, r->out.szDisplayName), sizeof(uint8_t)));
--			NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.szDisplayName, ndr_get_array_length(ndr, r->out.szDisplayName), sizeof(uint8_t), CH_DOS));
-+			NDR_CHECK(ndr_check_string_terminator(ndr, array_length, sizeof(uint8_t)));
-+			NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.szDisplayName, array_length, sizeof(uint8_t), CH_DOS));
- 			NDR_PULL_SET_MEM_CTX(ndr, _mem_save_szDisplayName_1, 0);
- 		}
- 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_szDisplayName_0, LIBNDR_FLAG_REF_ALLOC);
-@@ -1415,14 +1423,16 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
- 		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_pulTimeStamp_0, LIBNDR_FLAG_REF_ALLOC);
- 		NDR_CHECK(ndr_pull_array_size(ndr, &r->out.rgbAuxOut));
- 		NDR_CHECK(ndr_pull_array_length(ndr, &r->out.rgbAuxOut));
--		if (ndr_get_array_length(ndr, &r->out.rgbAuxOut) > ndr_get_array_size(ndr, &r->out.rgbAuxOut)) {
--			return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->out.rgbAuxOut), ndr_get_array_length(ndr, &r->out.rgbAuxOut));
-+		NDR_CHECK(ndr_get_array_length(ndr, &r->out.rgbAuxOut, &array_length));
-+		NDR_CHECK(ndr_get_array_size(ndr, &r->out.rgbAuxOut, &array_size));
-+		if (array_length > array_size) {
-+			return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", array_size, array_length);
- 		}
- 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
--			NDR_PULL_ALLOC_N(ndr, r->out.rgbAuxOut, ndr_get_array_size(ndr, &r->out.rgbAuxOut));
-+			NDR_PULL_ALLOC_N(ndr, r->out.rgbAuxOut, array_size);
- 		}
- 		/* Only try to pull rgbAuxOut if the fake array size is > 0 */
--		if (ndr_get_array_size(ndr, &r->out.rgbAuxOut)) {
-+		if (array_size) {
- 			_mem_save_rgbAuxOut_1 = NDR_PULL_GET_MEM_CTX(ndr);
- 			NDR_PULL_SET_MEM_CTX(ndr, r->out.rgbAuxOut, 0);
- 			NDR_CHECK(ndr_pull_mapi2k7_AuxInfo(ndr, NDR_SCALARS, r->out.rgbAuxOut));

SPECS/openchange.spec

@@ -23,7 +23,7 @@
 
 Name: openchange
 Version: 2.3
-Release: 32%{?dist}
+Release: 26%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -94,8 +94,6 @@ 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
-Patch20: openchange-2.3-samba-4.15.patch
 
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
@@ -176,8 +174,6 @@ 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
-%patch20 -p1 -b .samba-4.15
 
 %build
 ./autogen.sh
@@ -326,24 +322,6 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan
 %endif
 
 %changelog
-* Wed May 31 2023 Milan Crha <mcrha@redhat.com> - 2.3-32
-- Related: #2190417 (Rebuild for samba rebase to 4.18.x)
-
-* Thu Oct 27 2022 Milan Crha <mcrha@redhat.com> - 2.3-31
-- Related: #2132051 - Rebuild for samba rebase to 4.17.x
-
-* Wed May 04 2022 Milan Crha <mcrha@redhat.com> - 2.3-30
-- Related: #2081620 - Rebuild for samba rebase to 4.16.x
-
-* Thu Nov 25 2021 Milan Crha <mcrha@redhat.com> - 2.3-29
-- Related: #2013596 - Rebuild for samba rebase to 4.15.x
-
-* Wed May 12 2021 Milan Crha <mcrha@redhat.com> - 2.3-28
-- Related: #1944657 - Rebuild for samba rebase to 4.14.4
-
-* 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