summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-12 19:37:17 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-12 19:37:17 +0200
commit99fba0ca69516e571d88ecaea3937f1f73287cf3 (patch)
tree45276602b8cf2a840ff4bde07e7302b9a38bcac4 /source3
parent6f13c389d9feb84e4e84e3484dc7ddb6839f58ad (diff)
downloadsamba-99fba0ca69516e571d88ecaea3937f1f73287cf3.tar.gz
samba-99fba0ca69516e571d88ecaea3937f1f73287cf3.tar.bz2
samba-99fba0ca69516e571d88ecaea3937f1f73287cf3.zip
Remove Samba3/Samba4-specific bits.
Diffstat (limited to 'source3')
-rw-r--r--source3/librpc/tools/ndrdump.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/source3/librpc/tools/ndrdump.c b/source3/librpc/tools/ndrdump.c
index 08b969ae76..5b96e152bb 100644
--- a/source3/librpc/tools/ndrdump.c
+++ b/source3/librpc/tools/ndrdump.c
@@ -281,11 +281,7 @@ static const struct ndr_interface_table *load_iface_from_plugin(const char *plug
exit(1);
}
-#if (_SAMBA_BUILD_ >= 4)
- data = (uint8_t *)file_load(ctx_filename, &size, mem_ctx);
-#else
- data = (uint8_t *)file_load(ctx_filename, &size, 0);
-#endif
+ data = (uint8_t *)file_load(ctx_filename, &size, 0, mem_ctx);
if (!data) {
perror(ctx_filename);
exit(1);
@@ -312,11 +308,7 @@ static const struct ndr_interface_table *load_iface_from_plugin(const char *plug
}
if (filename)
-#if (_SAMBA_BUILD_ >= 4)
- data = (uint8_t *)file_load(filename, &size, mem_ctx);
-#else
- data = (uint8_t *)file_load(filename, &size, 0);
-#endif
+ data = (uint8_t *)file_load(filename, &size, 0, mem_ctx);
else
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;
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);
status = ndr_map_error2ntstatus(ndr_err);