sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-09 09:57:48 +03:00
Code

Remove Samba3/Samba4-specific bits.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-12 19:37:17 +02:00
parent 6f13c389d9
commit 99fba0ca69
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/librpc/tools/ndrdump.c
View File

@ -281,11 +281,7 @@ static const struct ndr_interface_table *load_iface_from_plugin(const char *plug
exit(1); exit(1);
} }
#if (_SAMBA_BUILD_ >= 4) data = (uint8_t *)file_load(ctx_filename, &size, 0, mem_ctx);
data = (uint8_t *)file_load(ctx_filename, &size, mem_ctx);
#else
data = (uint8_t *)file_load(ctx_filename, &size, 0);
#endif
if (!data) { if (!data) {
perror(ctx_filename); perror(ctx_filename);
exit(1); exit(1);
@ -312,11 +308,7 @@ static const struct ndr_interface_table *load_iface_from_plugin(const char *plug
} }
if (filename) if (filename)
#if (_SAMBA_BUILD_ >= 4) data = (uint8_t *)file_load(filename, &size, 0, mem_ctx);
data = (uint8_t *)file_load(filename, &size, mem_ctx);
#else
data = (uint8_t *)file_load(filename, &size, 0);
#endif
else else
data = (uint8_t *)stdin_load(mem_ctx, &size); data = (uint8_t *)stdin_load(mem_ctx, &size);
@ -368,7 +360,7 @@ static const struct ndr_interface_table *load_iface_from_plugin(const char *plug
uint8_t byte_a, byte_b; uint8_t byte_a, byte_b;
bool differ; bool differ;
ndr_v_push = ndr_push_init_ctx(mem_ctx); ndr_v_push = ndr_push_init_ctx(mem_ctx, NULL);
ndr_err = f->ndr_push(ndr_v_push, flags, st); ndr_err = f->ndr_push(ndr_v_push, flags, st);
status = ndr_map_error2ntstatus(ndr_err); status = ndr_map_error2ntstatus(ndr_err);