Remove Samba3/Samba4-specific bits.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 12 Oct 2008 17:37:17 +0000 (19:37 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 12 Oct 2008 17:37:17 +0000 (19:37 +0200)
source3/librpc/tools/ndrdump.c

index 08b969a..5b96e15 100644 (file)
@@ -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);