|
 |
94b7a1 |
diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c
|
|
|
94b7a1 |
--- openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.10-macros 2019-02-14 15:19:53.317769411 +0100
|
|
|
94b7a1 |
+++ openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c 2019-02-14 15:19:53.331769410 +0100
|
|
|
94b7a1 |
@@ -39,6 +39,8 @@
|
|
|
94b7a1 |
|
|
|
94b7a1 |
#include <time.h>
|
|
|
94b7a1 |
|
|
|
94b7a1 |
+#include "libmapi/libmapi_private.h"
|
|
|
94b7a1 |
+
|
|
|
94b7a1 |
static ssize_t openchange_sys_read(int fd, void *buf, size_t count)
|
|
|
94b7a1 |
{
|
|
|
94b7a1 |
ssize_t ret;
|
|
|
94b7a1 |
@@ -101,7 +103,7 @@ static enum ndr_err_code openchange_ndr_
|
|
|
94b7a1 |
NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->sid_rev_num));
|
|
|
94b7a1 |
NDR_CHECK(ndr_push_int8(ndr, NDR_SCALARS, r->num_auths));
|
|
|
94b7a1 |
NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6));
|
|
|
94b7a1 |
- if (r->num_auths < 0 || r->num_auths > ARRAY_SIZE(r->sub_auths)) {
|
|
|
94b7a1 |
+ if (r->num_auths < 0 || r->num_auths > OC_ARRAY_SIZE(r->sub_auths)) {
|
|
|
94b7a1 |
return ndr_push_error(ndr, NDR_ERR_RANGE, "value out of range");
|
|
|
94b7a1 |
}
|
|
|
94b7a1 |
for (cntr_sub_auths_0 = 0; cntr_sub_auths_0 < r->num_auths; cntr_sub_auths_0++) {
|
|
|
94b7a1 |
@@ -659,7 +661,7 @@ again:
|
|
|
94b7a1 |
|
|
|
94b7a1 |
OC_DEBUG(3, "Setting account password '%s'", mapiadmin_ctx->password);
|
|
|
94b7a1 |
|
|
|
94b7a1 |
- ZERO_STRUCT(u);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCT(u);
|
|
|
94b7a1 |
s.in.user_handle = &mapiadmin_ctx->user_ctx->user_handle;
|
|
|
94b7a1 |
s.in.info = &u;
|
|
|
94b7a1 |
s.in.level = 24;
|
|
|
94b7a1 |
@@ -687,7 +689,7 @@ again:
|
|
|
94b7a1 |
}
|
|
|
94b7a1 |
}
|
|
|
94b7a1 |
|
|
|
94b7a1 |
- ZERO_STRUCT(u);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCT(u);
|
|
|
94b7a1 |
s.in.user_handle = &mapiadmin_ctx->user_ctx->user_handle;
|
|
|
94b7a1 |
s.in.info = &u;
|
|
|
94b7a1 |
s.in.level = 21;
|
|
|
94b7a1 |
diff -up openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h.samba-4.10-macros openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h
|
|
|
94b7a1 |
--- openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h.samba-4.10-macros 2019-02-14 15:19:53.313769411 +0100
|
|
|
94b7a1 |
+++ openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h 2019-02-14 15:19:53.331769410 +0100
|
|
|
94b7a1 |
@@ -141,6 +141,11 @@ const char *libmapi_iface_best_ip(struc
|
|
|
94b7a1 |
bool libmapi_iface_is_local(struct interface *, const char *);
|
|
|
94b7a1 |
bool libmapi_iface_same_net(const char *, const char *, const char *);
|
|
|
94b7a1 |
|
|
|
94b7a1 |
+#define OC_ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
|
|
|
94b7a1 |
+#define OC_ZERO_STRUCTP(x) do { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } while(0)
|
|
|
94b7a1 |
+#define OC_ZERO_STRUCTPN(x) memset((char *)(x), 0, sizeof(*(x)))
|
|
|
94b7a1 |
+#define OC_ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
|
|
|
94b7a1 |
+
|
|
|
94b7a1 |
__END_DECLS
|
|
|
94b7a1 |
|
|
|
94b7a1 |
#undef _PRINTF_ATTRIBUTE
|
|
|
94b7a1 |
diff -up openchange-openchange-2.3-VULCAN/libmapi/socket/interface.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/libmapi/socket/interface.c
|
|
|
94b7a1 |
--- openchange-openchange-2.3-VULCAN/libmapi/socket/interface.c.samba-4.10-macros 2019-02-14 15:19:53.318769411 +0100
|
|
|
94b7a1 |
+++ openchange-openchange-2.3-VULCAN/libmapi/socket/interface.c 2019-02-14 15:19:53.331769410 +0100
|
|
|
94b7a1 |
@@ -70,7 +70,7 @@ static void add_interface(TALLOC_CTX *me
|
|
|
94b7a1 |
if (iface == NULL)
|
|
|
94b7a1 |
return;
|
|
|
94b7a1 |
|
|
|
94b7a1 |
- ZERO_STRUCTPN(iface);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTPN(iface);
|
|
|
94b7a1 |
|
|
|
94b7a1 |
iface->ip = ip;
|
|
|
94b7a1 |
iface->nmask = nmask;
|
|
|
94b7a1 |
diff -up openchange-openchange-2.3-VULCAN/mapiproxy/dcesrv_mapiproxy.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/mapiproxy/dcesrv_mapiproxy.c
|
|
|
94b7a1 |
--- openchange-openchange-2.3-VULCAN/mapiproxy/dcesrv_mapiproxy.c.samba-4.10-macros 2015-05-16 17:22:04.000000000 +0200
|
|
|
94b7a1 |
+++ openchange-openchange-2.3-VULCAN/mapiproxy/dcesrv_mapiproxy.c 2019-02-14 15:19:53.331769410 +0100
|
|
|
94b7a1 |
@@ -703,7 +703,7 @@ NTSTATUS dcerpc_server_mapiproxy_init(vo
|
|
|
94b7a1 |
NTSTATUS ret;
|
|
|
94b7a1 |
struct dcesrv_endpoint_server ep_server;
|
|
|
94b7a1 |
|
|
|
94b7a1 |
- ZERO_STRUCT(ep_server);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCT(ep_server);
|
|
|
94b7a1 |
|
|
|
94b7a1 |
/* Fill in our name */
|
|
|
94b7a1 |
ep_server.name = "mapiproxy";
|
|
|
94b7a1 |
diff -up openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/ndr_mapi.c
|
|
|
94b7a1 |
--- openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.10-macros 2019-02-14 15:19:53.329769410 +0100
|
|
|
94b7a1 |
+++ openchange-openchange-2.3-VULCAN/ndr_mapi.c 2019-02-14 15:19:53.331769410 +0100
|
|
|
94b7a1 |
@@ -921,7 +921,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
|
|
|
94b7a1 |
TALLOC_CTX *_mem_save_length_0;
|
|
|
94b7a1 |
|
|
|
94b7a1 |
if (flags & NDR_IN) {
|
|
|
94b7a1 |
- ZERO_STRUCT(r->out);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCT(r->out);
|
|
|
94b7a1 |
|
|
|
94b7a1 |
if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->in.handle);
|
|
|
94b7a1 |
@@ -961,7 +961,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.handle);
|
|
|
94b7a1 |
*r->out.handle = *r->in.handle;
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.mapi_response);
|
|
|
94b7a1 |
- ZERO_STRUCTP(r->out.mapi_response);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTP(r->out.mapi_response);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.length);
|
|
|
94b7a1 |
*r->out.length = *r->in.length;
|
|
|
94b7a1 |
}
|
|
|
94b7a1 |
@@ -1235,7 +1235,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
|
|
|
94b7a1 |
TALLOC_CTX *_mem_save_rgbAuxOut_1;
|
|
|
94b7a1 |
|
|
|
94b7a1 |
if (flags & NDR_IN) {
|
|
|
94b7a1 |
- ZERO_STRUCT(r->out);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCT(r->out);
|
|
|
94b7a1 |
|
|
|
94b7a1 |
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.szUserDN));
|
|
|
94b7a1 |
NDR_CHECK(ndr_pull_array_length(ndr, &r->in.szUserDN));
|
|
|
94b7a1 |
@@ -1294,19 +1294,19 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
|
|
|
94b7a1 |
}
|
|
|
94b7a1 |
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_pcbAuxOut_0, LIBNDR_FLAG_REF_ALLOC);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.handle);
|
|
|
94b7a1 |
- ZERO_STRUCTP(r->out.handle);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTP(r->out.handle);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.pcmsPollsMax);
|
|
|
94b7a1 |
- ZERO_STRUCTP(r->out.pcmsPollsMax);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTP(r->out.pcmsPollsMax);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.pcRetry);
|
|
|
94b7a1 |
- ZERO_STRUCTP(r->out.pcRetry);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTP(r->out.pcRetry);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.pcmsRetryDelay);
|
|
|
94b7a1 |
- ZERO_STRUCTP(r->out.pcmsRetryDelay);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTP(r->out.pcmsRetryDelay);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.picxr);
|
|
|
94b7a1 |
- ZERO_STRUCTP(r->out.picxr);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTP(r->out.picxr);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.szDNPrefix);
|
|
|
94b7a1 |
- ZERO_STRUCTP(r->out.szDNPrefix);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTP(r->out.szDNPrefix);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.szDisplayName);
|
|
|
94b7a1 |
- ZERO_STRUCTP(r->out.szDisplayName);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCTP(r->out.szDisplayName);
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.pulTimeStamp);
|
|
|
94b7a1 |
*r->out.pulTimeStamp = *r->in.pulTimeStamp;
|
|
|
94b7a1 |
NDR_PULL_ALLOC(ndr, r->out.pcbAuxOut);
|
|
|
94b7a1 |
diff -up openchange-openchange-2.3-VULCAN/testsuite/libmapi/mapi_property.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/testsuite/libmapi/mapi_property.c
|
|
|
94b7a1 |
--- openchange-openchange-2.3-VULCAN/testsuite/libmapi/mapi_property.c.samba-4.10-macros 2015-05-16 17:22:04.000000000 +0200
|
|
|
94b7a1 |
+++ openchange-openchange-2.3-VULCAN/testsuite/libmapi/mapi_property.c 2019-02-14 15:19:53.331769410 +0100
|
|
|
94b7a1 |
@@ -280,7 +280,7 @@ static void _make_test_srow(TALLOC_CTX *
|
|
|
94b7a1 |
{
|
|
|
94b7a1 |
struct SPropValue prop_val;
|
|
|
94b7a1 |
|
|
|
94b7a1 |
- ZERO_STRUCT(prop_val);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCT(prop_val);
|
|
|
94b7a1 |
/* PT_I8 */
|
|
|
94b7a1 |
prop_val.ulPropTag = PR_FID;
|
|
|
94b7a1 |
prop_val.value.d = 0x0123456789ABCDEFul;
|
|
|
94b7a1 |
diff -up openchange-openchange-2.3-VULCAN/testsuite/libmapiproxy/openchangedb_logger.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/testsuite/libmapiproxy/openchangedb_logger.c
|
|
|
94b7a1 |
--- openchange-openchange-2.3-VULCAN/testsuite/libmapiproxy/openchangedb_logger.c.samba-4.10-macros 2015-05-16 17:22:04.000000000 +0200
|
|
|
94b7a1 |
+++ openchange-openchange-2.3-VULCAN/testsuite/libmapiproxy/openchangedb_logger.c 2019-02-14 15:19:53.332769410 +0100
|
|
|
94b7a1 |
@@ -638,7 +638,7 @@ static void ocdb_logger_setup(void)
|
|
|
94b7a1 |
ck_abort();
|
|
|
94b7a1 |
}
|
|
|
94b7a1 |
|
|
|
94b7a1 |
- ZERO_STRUCT(functions_called);
|
|
|
94b7a1 |
+ OC_ZERO_STRUCT(functions_called);
|
|
|
94b7a1 |
}
|
|
|
94b7a1 |
|
|
|
94b7a1 |
static void ocdb_logger_teardown(void)
|