]>
Commit | Line | Data |
---|---|---|
2447b999 JP |
1 | diff --color -ur openchange-openchange-2.3-VULCAN.orig/asyncemsmdb.idl openchange-openchange-2.3-VULCAN/asyncemsmdb.idl |
2 | --- openchange-openchange-2.3-VULCAN.orig/asyncemsmdb.idl 2015-05-16 17:22:04.000000000 +0200 | |
3 | +++ openchange-openchange-2.3-VULCAN/asyncemsmdb.idl 2024-04-09 12:13:43.642624178 +0200 | |
4 | @@ -1,5 +1,6 @@ | |
5 | #include "idl_types.h" | |
6 | ||
7 | +cpp_quote("#include <inttypes.h>") | |
8 | cpp_quote("#include <gen_ndr/ndr_misc.h>") | |
9 | ||
10 | [ | |
11 | diff --color -ur openchange-openchange-2.3-VULCAN.orig/exchange.idl openchange-openchange-2.3-VULCAN/exchange.idl | |
12 | --- openchange-openchange-2.3-VULCAN.orig/exchange.idl 2024-04-09 11:55:51.644915544 +0200 | |
13 | +++ openchange-openchange-2.3-VULCAN/exchange.idl 2024-04-09 12:13:43.639290950 +0200 | |
14 | @@ -1,6 +1,7 @@ | |
15 | #include "idl_types.h" | |
16 | ||
17 | cpp_quote("#include <util/debug.h>") | |
18 | +cpp_quote("#include <inttypes.h>") | |
19 | cpp_quote("#include <gen_ndr/ndr_misc.h>") | |
20 | ||
21 | /* | |
22 | diff --color -ur openchange-openchange-2.3-VULCAN.orig/libmapi/libmapi_private.h openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h | |
23 | --- openchange-openchange-2.3-VULCAN.orig/libmapi/libmapi_private.h 2024-04-09 11:55:51.604916638 +0200 | |
24 | +++ openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h 2024-04-09 12:17:25.852448420 +0200 | |
25 | @@ -37,6 +37,12 @@ | |
26 | #include <gthread.h> | |
27 | #endif | |
28 | ||
29 | +#include <samba/version.h> | |
30 | + | |
31 | +#if SAMBA_VERSION_MAJOR == 4 && SAMBA_VERSION_MINOR < 20 | |
32 | +#define ndr_flags_type int | |
33 | +#endif | |
34 | + | |
35 | #undef _PRINTF_ATTRIBUTE | |
36 | #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) | |
37 | ||
38 | @@ -71,8 +77,8 @@ | |
39 | enum ndr_err_code ndr_pull_AppointmentRecurrencePattern(struct ndr_pull *, int, struct AppointmentRecurrencePattern *); | |
40 | enum ndr_err_code ndr_push_PersistDataArray(struct ndr_push *ndr, int ndr_flags, const struct PersistDataArray *r); | |
41 | enum ndr_err_code ndr_pull_PersistDataArray(struct ndr_pull *ndr, int ndr_flags, struct PersistDataArray *r); | |
42 | -enum ndr_err_code ndr_push_PersistElementArray(struct ndr_push *ndr, int ndr_flags, const struct PersistElementArray *r); | |
43 | -enum ndr_err_code ndr_pull_PersistElementArray(struct ndr_pull *ndr, int ndr_flags, struct PersistElementArray *r); | |
44 | +enum ndr_err_code ndr_push_PersistElementArray(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct PersistElementArray *r); | |
45 | +enum ndr_err_code ndr_pull_PersistElementArray(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct PersistElementArray *r); | |
46 | ||
47 | /* The following private definitions come from libmapi/nspi.c */ | |
48 | int nspi_disconnect_dtor(void *); | |
49 | diff --color -ur openchange-openchange-2.3-VULCAN.orig/ndr_mapi.c openchange-openchange-2.3-VULCAN/ndr_mapi.c | |
50 | --- openchange-openchange-2.3-VULCAN.orig/ndr_mapi.c 2024-04-09 11:55:51.698247417 +0200 | |
51 | +++ openchange-openchange-2.3-VULCAN/ndr_mapi.c 2024-04-09 12:13:43.629291263 +0200 | |
52 | @@ -207,7 +207,7 @@ | |
53 | } | |
54 | ||
55 | ||
56 | -_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_request(struct ndr_pull *ndr, int ndr_flags, struct mapi2k7_request *r) | |
57 | +_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_request(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi2k7_request *r) | |
58 | { | |
59 | if (ndr_flags & NDR_SCALARS) { | |
60 | NDR_CHECK(ndr_pull_align(ndr, 4)); | |
61 | @@ -258,7 +258,7 @@ | |
62 | } | |
63 | ||
64 | ||
65 | -_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_response(struct ndr_pull *ndr, int ndr_flags, struct mapi2k7_response *r) | |
66 | +_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_response(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi2k7_response *r) | |
67 | { | |
68 | if (ndr_flags & NDR_SCALARS) { | |
69 | NDR_CHECK(ndr_pull_RPC_HEADER_EXT(ndr, NDR_SCALARS, &r->header)); | |
70 | @@ -323,7 +323,7 @@ | |
71 | } | |
72 | ||
73 | ||
74 | -_PUBLIC_ enum ndr_err_code ndr_pull_AUX_HEADER(struct ndr_pull *ndr, int ndr_flags, struct AUX_HEADER *r) | |
75 | +_PUBLIC_ enum ndr_err_code ndr_pull_AUX_HEADER(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct AUX_HEADER *r) | |
76 | { | |
77 | struct ndr_pull *_ndr_buffer; | |
78 | uint32_t _flags_save_STRUCT = ndr->flags; | |
79 | @@ -358,7 +358,7 @@ | |
80 | } | |
81 | ||
82 | ||
83 | -_PUBLIC_ enum ndr_err_code ndr_push_AUX_HEADER(struct ndr_push *ndr, int ndr_flags, const struct AUX_HEADER *r) | |
84 | +_PUBLIC_ enum ndr_err_code ndr_push_AUX_HEADER(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct AUX_HEADER *r) | |
85 | { | |
86 | uint32_t _flags_save_STRUCT = ndr->flags; | |
87 | ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN); | |
88 | @@ -404,7 +404,7 @@ | |
89 | } | |
90 | ||
91 | ||
92 | -_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_AuxInfo(struct ndr_pull *ndr, int ndr_flags, struct mapi2k7_AuxInfo *r) | |
93 | +_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_AuxInfo(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi2k7_AuxInfo *r) | |
94 | { | |
95 | if (ndr_flags & NDR_SCALARS) { | |
96 | ||
97 | @@ -477,7 +477,7 @@ | |
98 | } | |
99 | ||
100 | ||
101 | -_PUBLIC_ enum ndr_err_code ndr_push_mapi2k7_AuxInfo(struct ndr_push *ndr, int ndr_flags, const struct mapi2k7_AuxInfo *r) | |
102 | +_PUBLIC_ enum ndr_err_code ndr_push_mapi2k7_AuxInfo(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi2k7_AuxInfo *r) | |
103 | { | |
104 | uint32_t i; | |
105 | ||
106 | @@ -594,7 +594,7 @@ | |
107 | (uint16_t) and next subtract when pushing the content blob | |
108 | */ | |
109 | ||
110 | -enum ndr_err_code ndr_push_mapi_request(struct ndr_push *ndr, int ndr_flags, const struct mapi_request *r) | |
111 | +enum ndr_err_code ndr_push_mapi_request(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_request *r) | |
112 | { | |
113 | uint32_t cntr_mapi_req_0; | |
114 | uint32_t count; | |
115 | @@ -614,7 +614,7 @@ | |
116 | return NDR_ERR_SUCCESS; | |
117 | } | |
118 | ||
119 | -enum ndr_err_code ndr_push_mapi_response(struct ndr_push *ndr, int ndr_flags, const struct mapi_response *r) | |
120 | +enum ndr_err_code ndr_push_mapi_response(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_response *r) | |
121 | { | |
122 | uint32_t cntr_mapi_repl_0; | |
123 | uint32_t count; | |
124 | @@ -640,7 +640,7 @@ | |
125 | pull mapi_request / mapi_response from the wire | |
126 | */ | |
127 | ||
128 | -enum ndr_err_code ndr_pull_mapi_request(struct ndr_pull *ndr, int ndr_flags, struct mapi_request *r) | |
129 | +enum ndr_err_code ndr_pull_mapi_request(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_request *r) | |
130 | { | |
131 | uint32_t length,count; | |
132 | uint32_t cntr_mapi_req_0; | |
133 | @@ -687,7 +687,7 @@ | |
134 | return NDR_ERR_SUCCESS; | |
135 | } | |
136 | ||
137 | -enum ndr_err_code ndr_pull_mapi_response(struct ndr_pull *ndr, int ndr_flags, struct mapi_response *r) | |
138 | +enum ndr_err_code ndr_pull_mapi_response(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_response *r) | |
139 | { | |
140 | uint32_t length,count; | |
141 | uint32_t cntr_mapi_repl_0; | |
142 | @@ -736,7 +736,7 @@ | |
143 | We stop processing the IDL if MAPISTATUS is different from MAPI_E_SUCCESS | |
144 | */ | |
145 | ||
146 | -_PUBLIC_ enum ndr_err_code ndr_push_EcDoRpc_MAPI_REPL(struct ndr_push *ndr, int ndr_flags, const struct EcDoRpc_MAPI_REPL *r) | |
147 | +_PUBLIC_ enum ndr_err_code ndr_push_EcDoRpc_MAPI_REPL(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct EcDoRpc_MAPI_REPL *r) | |
148 | { | |
149 | if (r->opnum != op_MAPI_Release) | |
150 | { | |
151 | @@ -790,7 +790,7 @@ | |
152 | return NDR_ERR_SUCCESS; | |
153 | } | |
154 | ||
155 | -enum ndr_err_code ndr_pull_EcDoRpc_MAPI_REPL(struct ndr_pull *ndr, int ndr_flags, struct EcDoRpc_MAPI_REPL *r) | |
156 | +enum ndr_err_code ndr_pull_EcDoRpc_MAPI_REPL(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct EcDoRpc_MAPI_REPL *r) | |
157 | { | |
158 | { | |
159 | uint32_t _flags_save_STRUCT = ndr->flags; | |
160 | @@ -913,7 +913,7 @@ | |
161 | } | |
162 | ||
163 | ||
164 | -_PUBLIC_ enum ndr_err_code ndr_pull_EcDoRpc(struct ndr_pull *ndr, int flags, struct EcDoRpc *r) | |
165 | +_PUBLIC_ enum ndr_err_code ndr_pull_EcDoRpc(struct ndr_pull *ndr, ndr_flags_type flags, struct EcDoRpc *r) | |
166 | { | |
167 | TALLOC_CTX *_mem_save_handle_0; | |
168 | TALLOC_CTX *_mem_save_mapi_request_0; | |
169 | @@ -1006,7 +1006,7 @@ | |
170 | } | |
171 | ||
172 | ||
173 | -_PUBLIC_ enum ndr_err_code ndr_push_EcDoRpc(struct ndr_push *ndr, int flags, const struct EcDoRpc *r) | |
174 | +_PUBLIC_ enum ndr_err_code ndr_push_EcDoRpc(struct ndr_push *ndr, ndr_flags_type flags, const struct EcDoRpc *r) | |
175 | { | |
176 | if (flags & NDR_IN) { | |
177 | if (r->in.handle == NULL) { | |
178 | @@ -1068,7 +1068,7 @@ | |
179 | } | |
180 | ||
181 | ||
182 | -_PUBLIC_ enum ndr_err_code ndr_push_EcDoConnectEx(struct ndr_push *ndr, int flags, const struct EcDoConnectEx *r) | |
183 | +_PUBLIC_ enum ndr_err_code ndr_push_EcDoConnectEx(struct ndr_push *ndr, ndr_flags_type flags, const struct EcDoConnectEx *r) | |
184 | { | |
185 | uint32_t cntr_rgwClientVersion_0; | |
186 | uint32_t cntr_rgwServerVersion_0; | |
187 | @@ -1213,7 +1213,7 @@ | |
188 | return NDR_ERR_SUCCESS; | |
189 | } | |
190 | ||
191 | -_PUBLIC_ enum ndr_err_code ndr_pull_EcDoConnectEx(struct ndr_pull *ndr, int flags, struct EcDoConnectEx *r) | |
192 | +_PUBLIC_ enum ndr_err_code ndr_pull_EcDoConnectEx(struct ndr_pull *ndr, ndr_flags_type flags, struct EcDoConnectEx *r) | |
193 | { | |
194 | uint32_t _ptr_szDNPrefix; | |
195 | uint32_t _ptr_szDisplayName; | |
196 | @@ -1452,7 +1452,7 @@ | |
197 | return NDR_ERR_SUCCESS; | |
198 | } | |
199 | ||
200 | -_PUBLIC_ void ndr_print_EcDoConnectEx(struct ndr_print *ndr, const char *name, int flags, const struct EcDoConnectEx *r) | |
201 | +_PUBLIC_ void ndr_print_EcDoConnectEx(struct ndr_print *ndr, const char *name, ndr_flags_type flags, const struct EcDoConnectEx *r) | |
202 | { | |
203 | uint32_t cntr_rgwClientVersion_0; | |
204 | uint32_t cntr_rgwServerVersion_0; | |
205 | @@ -1587,7 +1587,7 @@ | |
206 | ndr->depth--; | |
207 | } | |
208 | ||
209 | -_PUBLIC_ void ndr_print_EcDoRpcExt(struct ndr_print *ndr, const char *name, int flags, const struct EcDoRpcExt *r) | |
210 | +_PUBLIC_ void ndr_print_EcDoRpcExt(struct ndr_print *ndr, const char *name, ndr_flags_type flags, const struct EcDoRpcExt *r) | |
211 | { | |
212 | DATA_BLOB rgbIn; | |
213 | DATA_BLOB rgbOut; | |
214 | @@ -1705,7 +1705,7 @@ | |
215 | talloc_free(mem_ctx); | |
216 | } | |
217 | ||
218 | -_PUBLIC_ void ndr_print_EcDoRpcExt2(struct ndr_print *ndr, const char *name, int flags, const struct EcDoRpcExt2 *r) | |
219 | +_PUBLIC_ void ndr_print_EcDoRpcExt2(struct ndr_print *ndr, const char *name, ndr_flags_type flags, const struct EcDoRpcExt2 *r) | |
220 | { | |
221 | uint32_t cntr_rgbAuxOut_0; | |
222 | DATA_BLOB rgbIn; | |
223 | @@ -1852,7 +1852,7 @@ | |
224 | If we have no results, do not push/pull the DATA_BLOB | |
225 | */ | |
226 | ||
227 | -enum ndr_err_code ndr_push_QueryRows_repl(struct ndr_push *ndr, int ndr_flags, const struct QueryRows_repl *r) | |
228 | +enum ndr_err_code ndr_push_QueryRows_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct QueryRows_repl *r) | |
229 | { | |
230 | { | |
231 | uint32_t _flags_save_STRUCT = ndr->flags; | |
232 | @@ -1876,7 +1876,7 @@ | |
233 | return NDR_ERR_SUCCESS; | |
234 | } | |
235 | ||
236 | -enum ndr_err_code ndr_pull_QueryRows_repl(struct ndr_pull *ndr, int ndr_flags, struct QueryRows_repl *r) | |
237 | +enum ndr_err_code ndr_pull_QueryRows_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct QueryRows_repl *r) | |
238 | { | |
239 | { | |
240 | uint32_t _flags_save_STRUCT = ndr->flags; | |
241 | @@ -1906,7 +1906,7 @@ | |
242 | } | |
243 | ||
244 | ||
245 | -enum ndr_err_code ndr_push_Logon_req(struct ndr_push *ndr, int ndr_flags, const struct Logon_req *r) | |
246 | +enum ndr_err_code ndr_push_Logon_req(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Logon_req *r) | |
247 | { | |
248 | { | |
249 | uint32_t _flags_save_STRUCT = ndr->flags; | |
250 | @@ -1933,7 +1933,7 @@ | |
251 | } | |
252 | ||
253 | /* MoveFolder */ | |
254 | -enum ndr_err_code ndr_push_MoveFolder_repl(struct ndr_push *ndr, int ndr_flags, const struct MoveFolder_repl *r) | |
255 | +enum ndr_err_code ndr_push_MoveFolder_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct MoveFolder_repl *r) | |
256 | { | |
257 | { | |
258 | uint32_t _flags_save_STRUCT = ndr->flags; | |
259 | @@ -1952,7 +1952,7 @@ | |
260 | return NDR_ERR_SUCCESS; | |
261 | } | |
262 | ||
263 | -enum ndr_err_code ndr_pull_MoveFolder_repl(struct ndr_pull *ndr, int ndr_flags, struct MoveFolder_repl *r) | |
264 | +enum ndr_err_code ndr_pull_MoveFolder_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct MoveFolder_repl *r) | |
265 | { | |
266 | { | |
267 | uint32_t _flags_save_STRUCT = ndr->flags; | |
268 | @@ -1990,7 +1990,7 @@ | |
269 | /* /MoveFolder */ | |
270 | ||
271 | /* CopyFolder */ | |
272 | -enum ndr_err_code ndr_push_CopyFolder_repl(struct ndr_push *ndr, int ndr_flags, const struct CopyFolder_repl *r) | |
273 | +enum ndr_err_code ndr_push_CopyFolder_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct CopyFolder_repl *r) | |
274 | { | |
275 | { | |
276 | uint32_t _flags_save_STRUCT = ndr->flags; | |
277 | @@ -2009,7 +2009,7 @@ | |
278 | return NDR_ERR_SUCCESS; | |
279 | } | |
280 | ||
281 | -enum ndr_err_code ndr_pull_CopyFolder_repl(struct ndr_pull *ndr, int ndr_flags, struct CopyFolder_repl *r) | |
282 | +enum ndr_err_code ndr_pull_CopyFolder_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct CopyFolder_repl *r) | |
283 | { | |
284 | { | |
285 | uint32_t _flags_save_STRUCT = ndr->flags; | |
286 | @@ -2098,12 +2098,12 @@ | |
287 | * Fake wrapper over mapi_SRestriction. Workaround the no-pointer deep | |
288 | * recursion problem in pidl | |
289 | */ | |
290 | -enum ndr_err_code ndr_push_mapi_SRestriction_wrap(struct ndr_push *ndr, int ndr_flags, const struct mapi_SRestriction_wrap *r) | |
291 | +enum ndr_err_code ndr_push_mapi_SRestriction_wrap(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_SRestriction_wrap *r) | |
292 | { | |
293 | return ndr_push_mapi_SRestriction(ndr, ndr_flags, (struct mapi_SRestriction *)r); | |
294 | } | |
295 | ||
296 | -enum ndr_err_code ndr_pull_mapi_SRestriction_wrap(struct ndr_pull *ndr, int ndr_flags, struct mapi_SRestriction_wrap *r) | |
297 | +enum ndr_err_code ndr_pull_mapi_SRestriction_wrap(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_SRestriction_wrap *r) | |
298 | { | |
299 | return ndr_pull_mapi_SRestriction(ndr, ndr_flags, (struct mapi_SRestriction *)r); | |
300 | } | |
301 | @@ -2117,13 +2117,13 @@ | |
302 | * Fake wrapper over mapi_SPropValue. Workaround the no-pointer deep | |
303 | * recursion problem in pidl | |
304 | */ | |
305 | -enum ndr_err_code ndr_push_mapi_SPropValue_wrap(struct ndr_push *ndr, int ndr_flags, const struct mapi_SPropValue_wrap *r) | |
306 | +enum ndr_err_code ndr_push_mapi_SPropValue_wrap(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_SPropValue_wrap *r) | |
307 | { | |
308 | NDR_CHECK(ndr_push_align(ndr, 8)); | |
309 | return ndr_push_mapi_SPropValue(ndr, NDR_SCALARS, (const struct mapi_SPropValue *)r); | |
310 | } | |
311 | ||
312 | -enum ndr_err_code ndr_pull_mapi_SPropValue_wrap(struct ndr_pull *ndr, int ndr_flags, struct mapi_SPropValue_wrap *r) | |
313 | +enum ndr_err_code ndr_pull_mapi_SPropValue_wrap(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_SPropValue_wrap *r) | |
314 | { | |
315 | return ndr_pull_mapi_SPropValue(ndr, NDR_SCALARS, (struct mapi_SPropValue *)r); | |
316 | } | |
317 | @@ -2138,13 +2138,13 @@ | |
318 | * Fake wrapper over mapi_SPropValue_array. Workaround the no-pointer deep | |
319 | * recursion problem in pidl | |
320 | */ | |
321 | -enum ndr_err_code ndr_push_mapi_SPropValue_array_wrap(struct ndr_push *ndr, int ndr_flags, const struct mapi_SPropValue_array_wrap *r) | |
322 | +enum ndr_err_code ndr_push_mapi_SPropValue_array_wrap(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_SPropValue_array_wrap *r) | |
323 | { | |
324 | NDR_CHECK(ndr_push_align(ndr, 8)); | |
325 | return ndr_push_mapi_SPropValue_array(ndr, NDR_SCALARS, (const struct mapi_SPropValue_array *)r); | |
326 | } | |
327 | ||
328 | -enum ndr_err_code ndr_pull_mapi_SPropValue_array_wrap(struct ndr_pull *ndr, int ndr_flags, struct mapi_SPropValue_array_wrap *r) | |
329 | +enum ndr_err_code ndr_pull_mapi_SPropValue_array_wrap(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_SPropValue_array_wrap *r) | |
330 | { | |
331 | return ndr_pull_mapi_SPropValue_array(ndr, NDR_SCALARS, (struct mapi_SPropValue_array *)r); | |
332 | } | |
333 | @@ -2154,7 +2154,7 @@ | |
334 | ndr_print_mapi_SPropValue_array(ndr, name, (const struct mapi_SPropValue_array *)r); | |
335 | } | |
336 | ||
337 | -enum ndr_err_code ndr_push_RestrictionVariable(struct ndr_push *ndr, int ndr_flags, const union RestrictionVariable *r) | |
338 | +enum ndr_err_code ndr_push_RestrictionVariable(struct ndr_push *ndr, ndr_flags_type ndr_flags, const union RestrictionVariable *r) | |
339 | { | |
340 | { | |
341 | uint32_t _flags_save_STRUCT = ndr->flags; | |
342 | @@ -2200,7 +2200,7 @@ | |
343 | return NDR_ERR_SUCCESS; | |
344 | } | |
345 | ||
346 | -enum ndr_err_code ndr_pull_RestrictionVariable(struct ndr_pull *ndr, int ndr_flags, union RestrictionVariable *r) | |
347 | +enum ndr_err_code ndr_pull_RestrictionVariable(struct ndr_pull *ndr, ndr_flags_type ndr_flags, union RestrictionVariable *r) | |
348 | { | |
349 | uint32_t level; | |
350 | TALLOC_CTX *_mem_save_res_0; | |
351 | @@ -2272,28 +2272,28 @@ | |
352 | } | |
353 | } | |
354 | ||
355 | -enum ndr_err_code ndr_push_Release_req(struct ndr_push *ndr, int ndr_flags, const struct Release_req *r) | |
356 | +enum ndr_err_code ndr_push_Release_req(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Release_req *r) | |
357 | { | |
358 | return NDR_ERR_SUCCESS; | |
359 | } | |
360 | ||
361 | -enum ndr_err_code ndr_pull_Release_req(struct ndr_pull *ndr, int ndr_flags, struct Release_req *r) | |
362 | +enum ndr_err_code ndr_pull_Release_req(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct Release_req *r) | |
363 | { | |
364 | return NDR_ERR_SUCCESS; | |
365 | } | |
366 | ||
367 | -enum ndr_err_code ndr_push_Release_repl(struct ndr_push *ndr, int ndr_flags, const struct Release_repl *r) | |
368 | +enum ndr_err_code ndr_push_Release_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Release_repl *r) | |
369 | { | |
370 | return NDR_ERR_SUCCESS; | |
371 | } | |
372 | ||
373 | -enum ndr_err_code ndr_pull_Release_repl(struct ndr_pull *ndr, int ndr_flags, struct Release_repl *r) | |
374 | +enum ndr_err_code ndr_pull_Release_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct Release_repl *r) | |
375 | { | |
376 | return NDR_ERR_SUCCESS; | |
377 | } | |
378 | ||
379 | ||
380 | -enum ndr_err_code ndr_push_GetSearchCriteria_repl(struct ndr_push *ndr, int ndr_flags, const struct GetSearchCriteria_repl *r) | |
381 | +enum ndr_err_code ndr_push_GetSearchCriteria_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct GetSearchCriteria_repl *r) | |
382 | { | |
383 | uint32_t cntr_FolderIds_0; | |
384 | { | |
385 | @@ -2324,7 +2324,7 @@ | |
386 | } | |
387 | ||
388 | ||
389 | -enum ndr_err_code ndr_pull_GetSearchCriteria_repl(struct ndr_pull *ndr, int ndr_flags, struct GetSearchCriteria_repl *r) | |
390 | +enum ndr_err_code ndr_pull_GetSearchCriteria_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct GetSearchCriteria_repl *r) | |
391 | { | |
392 | uint32_t cntr_FolderIds_0; | |
393 | TALLOC_CTX *_mem_save_FolderIds_0; | |
394 | @@ -2392,42 +2392,42 @@ | |
395 | } | |
396 | } | |
397 | ||
398 | -enum ndr_err_code ndr_push_Backoff_req(struct ndr_push *ndr, int ndr_flags, const struct Backoff_req *r) | |
399 | +enum ndr_err_code ndr_push_Backoff_req(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Backoff_req *r) | |
400 | { | |
401 | return NDR_ERR_SUCCESS; | |
402 | } | |
403 | ||
404 | -enum ndr_err_code ndr_pull_Backoff_req(struct ndr_pull *ndr, int ndr_flags, struct Backoff_req *r) | |
405 | +enum ndr_err_code ndr_pull_Backoff_req(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct Backoff_req *r) | |
406 | { | |
407 | return NDR_ERR_SUCCESS; | |
408 | } | |
409 | ||
410 | -enum ndr_err_code ndr_push_Backoff_repl(struct ndr_push *ndr, int ndr_flags, const struct Backoff_repl *r) | |
411 | +enum ndr_err_code ndr_push_Backoff_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Backoff_repl *r) | |
412 | { | |
413 | return NDR_ERR_SUCCESS; | |
414 | } | |
415 | ||
416 | -enum ndr_err_code ndr_pull_Backoff_repl(struct ndr_pull *ndr, int ndr_flags, struct Backoff_repl *r) | |
417 | +enum ndr_err_code ndr_pull_Backoff_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct Backoff_repl *r) | |
418 | { | |
419 | return NDR_ERR_SUCCESS; | |
420 | } | |
421 | ||
422 | -enum ndr_err_code ndr_push_BufferTooSmall_req(struct ndr_push *ndr, int ndr_flags, const struct BufferTooSmall_req *r) | |
423 | +enum ndr_err_code ndr_push_BufferTooSmall_req(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct BufferTooSmall_req *r) | |
424 | { | |
425 | return NDR_ERR_SUCCESS; | |
426 | } | |
427 | ||
428 | -enum ndr_err_code ndr_pull_BufferTooSmall_req(struct ndr_pull *ndr, int ndr_flags, struct BufferTooSmall_req *r) | |
429 | +enum ndr_err_code ndr_pull_BufferTooSmall_req(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct BufferTooSmall_req *r) | |
430 | { | |
431 | return NDR_ERR_SUCCESS; | |
432 | } | |
433 | ||
434 | -enum ndr_err_code ndr_push_BufferTooSmall_repl(struct ndr_push *ndr, int ndr_flags, const struct BufferTooSmall_repl *r) | |
435 | +enum ndr_err_code ndr_push_BufferTooSmall_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct BufferTooSmall_repl *r) | |
436 | { | |
437 | return NDR_ERR_SUCCESS; | |
438 | } | |
439 | ||
440 | -enum ndr_err_code ndr_pull_BufferTooSmall_repl(struct ndr_pull *ndr, int ndr_flags, struct BufferTooSmall_repl *r) | |
441 | +enum ndr_err_code ndr_pull_BufferTooSmall_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct BufferTooSmall_repl *r) | |
442 | { | |
443 | return NDR_ERR_SUCCESS; | |
444 | } | |
445 | @@ -2730,7 +2730,7 @@ | |
446 | return NDR_ERR_SUCCESS; | |
447 | } | |
448 | ||
449 | -_PUBLIC_ enum ndr_err_code ndr_push_PersistElementArray(struct ndr_push *ndr, int ndr_flags, const struct PersistElementArray *r) | |
450 | +_PUBLIC_ enum ndr_err_code ndr_push_PersistElementArray(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct PersistElementArray *r) | |
451 | { | |
452 | uint32_t cntr_lpPersistElement_1; | |
453 | { | |
454 | @@ -2748,7 +2748,7 @@ | |
455 | return NDR_ERR_SUCCESS; | |
456 | } | |
457 | ||
458 | -_PUBLIC_ enum ndr_err_code ndr_pull_PersistElementArray(struct ndr_pull *ndr, int ndr_flags, struct PersistElementArray *r) | |
459 | +_PUBLIC_ enum ndr_err_code ndr_pull_PersistElementArray(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct PersistElementArray *r) | |
460 | { | |
461 | uint32_t cntr_lpPersistElement_0; | |
462 | TALLOC_CTX *_mem_save_lpPersistElement_0; | |
463 | Only in openchange-openchange-2.3-VULCAN: ndr_mapi.c.orig |