rpms/openchange
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import openchange-2.3-29.el8

Browse Source
This commit is contained in:
CentOS Sources 2022-01-04 04:20:54 +00:00 committed by Stepan Oksanichenko
parent b574f126cf
commit b0b9988c67
2 changed files with 112 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
SOURCES/openchange-2.3-samba-4.15.patch Normal file
View File

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

10
SPECS/openchange.spec
View File

@ -23,7 +23,7 @@
Name: openchange Name: openchange
Version: 2.3 Version: 2.3
Release: 27%{?dist} Release: 29%{?dist}
Group: Applications/System Group: Applications/System
Summary: Provides access to Microsoft Exchange servers using native protocols Summary: Provides access to Microsoft Exchange servers using native protocols
License: GPLv3+ and Public Domain License: GPLv3+ and Public Domain
@ -95,6 +95,7 @@ Patch16: openchange-2.3-samba-4.11.patch
Patch17: openchange-2.3-samba-4.11.2.patch Patch17: openchange-2.3-samba-4.11.2.patch
Patch18: openchange-2.3-samba-4.12.patch Patch18: openchange-2.3-samba-4.12.patch
Patch19: openchange-2.3-samba-4.13.patch Patch19: openchange-2.3-samba-4.13.patch
Patch20: openchange-2.3-samba-4.15.patch
%description %description
OpenChange provides libraries to access Microsoft Exchange servers OpenChange provides libraries to access Microsoft Exchange servers
@ -176,6 +177,7 @@ This package provides the server elements for OpenChange.
%patch17 -p1 -b .samba-4.11.2 %patch17 -p1 -b .samba-4.11.2
%patch18 -p1 -b .samba-4.12 %patch18 -p1 -b .samba-4.12
%patch19 -p1 -b .samba-4.13 %patch19 -p1 -b .samba-4.13
%patch20 -p1 -b .samba-4.15
%build %build
./autogen.sh ./autogen.sh
@ -324,6 +326,12 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan
%endif %endif
%changelog %changelog
* 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 * Fri Nov 13 2020 Milan Crha <mcrha@redhat.com> - 2.3-27
- Rebuild for newer samba - Rebuild for newer samba