openchange-samba-4.10-macros.patch

   1 diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c
   2 --- openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.10-macros    2019-02-14 15:19:53.317769411 +0100
   3 +++ openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c      2019-02-14 15:19:53.331769410 +0100
   4 @@ -39,6 +39,8 @@
   5
   6  #include <time.h>
   7
   8 +#include "libmapi/libmapi_private.h"
   9 +
  10  static ssize_t openchange_sys_read(int fd, void *buf, size_t count)
  11  {
  12         ssize_t ret;
  13 @@ -101,7 +103,7 @@ static enum ndr_err_code openchange_ndr_
  14                 NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->sid_rev_num));
  15                 NDR_CHECK(ndr_push_int8(ndr, NDR_SCALARS, r->num_auths));
  16                 NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6));
  17 -               if (r->num_auths < 0 || r->num_auths > ARRAY_SIZE(r->sub_auths)) {
  18 +               if (r->num_auths < 0 || r->num_auths > OC_ARRAY_SIZE(r->sub_auths)) {
  19                         return ndr_push_error(ndr, NDR_ERR_RANGE, "value out of range");
  20                 }
  21                 for (cntr_sub_auths_0 = 0; cntr_sub_auths_0 < r->num_auths; cntr_sub_auths_0++) {
  22 @@ -659,7 +661,7 @@ again:
  23
  24         OC_DEBUG(3, "Setting account password '%s'", mapiadmin_ctx->password);
  25
  26 -       ZERO_STRUCT(u);
  27 +       OC_ZERO_STRUCT(u);
  28         s.in.user_handle = &mapiadmin_ctx->user_ctx->user_handle;
  29         s.in.info = &u;
  30         s.in.level = 24;
  31 @@ -687,7 +689,7 @@ again:
  32                 }
  33         }
  34
  35 -       ZERO_STRUCT(u);
  36 +       OC_ZERO_STRUCT(u);
  37         s.in.user_handle = &mapiadmin_ctx->user_ctx->user_handle;
  38         s.in.info = &u;
  39         s.in.level = 21;
  40 diff -up openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h.samba-4.10-macros openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h
  41 --- openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h.samba-4.10-macros        2019-02-14 15:19:53.313769411 +0100
  42 +++ openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h  2019-02-14 15:19:53.331769410 +0100
  43 @@ -141,6 +141,11 @@ const char         *libmapi_iface_best_ip(struc
  44  bool                   libmapi_iface_is_local(struct interface *, const char *);
  45  bool                   libmapi_iface_same_net(const char *, const char *, const char *);
  46
  47 +#define OC_ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
  48 +#define OC_ZERO_STRUCTP(x) do { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } while(0)
  49 +#define OC_ZERO_STRUCTPN(x) memset((char *)(x), 0, sizeof(*(x)))
  50 +#define OC_ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
  51 +
  52  __END_DECLS
  53
  54  #undef _PRINTF_ATTRIBUTE
  55 diff -up openchange-openchange-2.3-VULCAN/libmapi/socket/interface.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/libmapi/socket/interface.c
  56 --- openchange-openchange-2.3-VULCAN/libmapi/socket/interface.c.samba-4.10-macros       2019-02-14 15:19:53.318769411 +0100
  57 +++ openchange-openchange-2.3-VULCAN/libmapi/socket/interface.c 2019-02-14 15:19:53.331769410 +0100
  58 @@ -70,7 +70,7 @@ static void add_interface(TALLOC_CTX *me
  59         if (iface == NULL)
  60                 return;
  61
  62 -       ZERO_STRUCTPN(iface);
  63 +       OC_ZERO_STRUCTPN(iface);
  64
  65         iface->ip = ip;
  66         iface->nmask = nmask;
  67 diff -up openchange-openchange-2.3-VULCAN/mapiproxy/dcesrv_mapiproxy.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/mapiproxy/dcesrv_mapiproxy.c
  68 --- openchange-openchange-2.3-VULCAN/mapiproxy/dcesrv_mapiproxy.c.samba-4.10-macros     2015-05-16 17:22:04.000000000 +0200
  69 +++ openchange-openchange-2.3-VULCAN/mapiproxy/dcesrv_mapiproxy.c       2019-02-14 15:19:53.331769410 +0100
  70 @@ -703,7 +703,7 @@ NTSTATUS dcerpc_server_mapiproxy_init(vo
  71         NTSTATUS                        ret;
  72         struct dcesrv_endpoint_server   ep_server;
  73
  74 -       ZERO_STRUCT(ep_server);
  75 +       OC_ZERO_STRUCT(ep_server);
  76
  77         /* Fill in our name */
  78         ep_server.name = "mapiproxy";
  79 diff -up openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.10-macros openchange-openchange-2.3-VULCAN/ndr_mapi.c
  80 --- openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.10-macros       2019-02-14 15:19:53.329769410 +0100
  81 +++ openchange-openchange-2.3-VULCAN/ndr_mapi.c 2019-02-14 15:19:53.331769410 +0100
  82 @@ -921,7 +921,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
  83         TALLOC_CTX *_mem_save_length_0;
  84
  85         if (flags & NDR_IN) {
  86 -               ZERO_STRUCT(r->out);
  87 +               OC_ZERO_STRUCT(r->out);
  88
  89                 if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
  90                         NDR_PULL_ALLOC(ndr, r->in.handle);
  91 @@ -961,7 +961,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
  92                 NDR_PULL_ALLOC(ndr, r->out.handle);
  93                 *r->out.handle = *r->in.handle;
  94                 NDR_PULL_ALLOC(ndr, r->out.mapi_response);
  95 -               ZERO_STRUCTP(r->out.mapi_response);
  96 +               OC_ZERO_STRUCTP(r->out.mapi_response);
  97                 NDR_PULL_ALLOC(ndr, r->out.length);
  98                 *r->out.length = *r->in.length;
  99         }
 100 @@ -1235,7 +1235,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
 101         TALLOC_CTX      *_mem_save_rgbAuxOut_1;
 102
 103         if (flags & NDR_IN) {
 104 -               ZERO_STRUCT(r->out);
 105 +               OC_ZERO_STRUCT(r->out);
 106
 107                 NDR_CHECK(ndr_pull_array_size(ndr, &r->in.szUserDN));
 108                 NDR_CHECK(ndr_pull_array_length(ndr, &r->in.szUserDN));
 109 @@ -1294,19 +1294,19 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EcDo
 110                 }
 111                 NDR_PULL_SET_MEM_CTX(ndr, _mem_save_pcbAuxOut_0, LIBNDR_FLAG_REF_ALLOC);
 112                 NDR_PULL_ALLOC(ndr, r->out.handle);
 113 -               ZERO_STRUCTP(r->out.handle);
 114 +               OC_ZERO_STRUCTP(r->out.handle);
 115                 NDR_PULL_ALLOC(ndr, r->out.pcmsPollsMax);
 116 -               ZERO_STRUCTP(r->out.pcmsPollsMax);
 117 +               OC_ZERO_STRUCTP(r->out.pcmsPollsMax);
 118                 NDR_PULL_ALLOC(ndr, r->out.pcRetry);
 119 -               ZERO_STRUCTP(r->out.pcRetry);
 120 +               OC_ZERO_STRUCTP(r->out.pcRetry);
 121                 NDR_PULL_ALLOC(ndr, r->out.pcmsRetryDelay);
 122 -               ZERO_STRUCTP(r->out.pcmsRetryDelay);
 123 +               OC_ZERO_STRUCTP(r->out.pcmsRetryDelay);
 124                 NDR_PULL_ALLOC(ndr, r->out.picxr);
 125 -               ZERO_STRUCTP(r->out.picxr);
 126 +               OC_ZERO_STRUCTP(r->out.picxr);
 127                 NDR_PULL_ALLOC(ndr, r->out.szDNPrefix);
 128 -               ZERO_STRUCTP(r->out.szDNPrefix);
 129 +               OC_ZERO_STRUCTP(r->out.szDNPrefix);
 130                 NDR_PULL_ALLOC(ndr, r->out.szDisplayName);
 131 -               ZERO_STRUCTP(r->out.szDisplayName);
 132 +               OC_ZERO_STRUCTP(r->out.szDisplayName);
 133                 NDR_PULL_ALLOC(ndr, r->out.pulTimeStamp);
 134                 *r->out.pulTimeStamp = *r->in.pulTimeStamp;
 135                 NDR_PULL_ALLOC(ndr, r->out.pcbAuxOut);
 136 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
 137 --- openchange-openchange-2.3-VULCAN/testsuite/libmapi/mapi_property.c.samba-4.10-macros        2015-05-16 17:22:04.000000000 +0200
 138 +++ openchange-openchange-2.3-VULCAN/testsuite/libmapi/mapi_property.c  2019-02-14 15:19:53.331769410 +0100
 139 @@ -280,7 +280,7 @@ static void _make_test_srow(TALLOC_CTX *
 140  {
 141         struct SPropValue prop_val;
 142
 143 -       ZERO_STRUCT(prop_val);
 144 +       OC_ZERO_STRUCT(prop_val);
 145         /* PT_I8 */
 146         prop_val.ulPropTag = PR_FID;
 147         prop_val.value.d = 0x0123456789ABCDEFul;
 148 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
 149 --- openchange-openchange-2.3-VULCAN/testsuite/libmapiproxy/openchangedb_logger.c.samba-4.10-macros     2015-05-16 17:22:04.000000000 +0200
 150 +++ openchange-openchange-2.3-VULCAN/testsuite/libmapiproxy/openchangedb_logger.c       2019-02-14 15:19:53.332769410 +0100
 151 @@ -638,7 +638,7 @@ static void ocdb_logger_setup(void)
 152                 ck_abort();
 153         }
 154
 155 -       ZERO_STRUCT(functions_called);
 156 +       OC_ZERO_STRUCT(functions_called);
 157  }
 158
 159  static void ocdb_logger_teardown(void)