[SCM] Samba Shared Repository - branch master updated - 99fba0ca69516e571d88ecaea3937f1f73287cf3

[Jelmer Vernooij]

The branch, master has been updated
       via  99fba0ca69516e571d88ecaea3937f1f73287cf3 (commit)
       via  6f13c389d9feb84e4e84e3484dc7ddb6839f58ad (commit)
      from  cc6227d0bc94192675475d174f1de19797b0409b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 99fba0ca69516e571d88ecaea3937f1f73287cf3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 12 19:37:17 2008 +0200

    Remove Samba3/Samba4-specific bits.

commit 6f13c389d9feb84e4e84e3484dc7ddb6839f58ad
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 12 19:36:12 2008 +0200

    Fix other paths to binding.o.

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in            |    8 ++++----
 source3/librpc/tools/ndrdump.c |   14 +++-----------
 2 files changed, 7 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 846d1e0..97e8ccb 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -734,7 +734,7 @@ SMBCONTROL_OBJ = utils/smbcontrol.o $(LOCKING_OBJ) $(PARAM_OBJ) \
 SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
              $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
 	     $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
-             rpc_client/cli_pipe.o librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \
+             rpc_client/cli_pipe.o ../librpc/rpc/binding.o $(RPC_PARSE_OBJ2) \
              $(RPC_CLIENT_OBJ1) \
 	     $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(LDB_OBJ) $(GROUPDB_OBJ) \
 	     $(LIBMSRPC_GEN_OBJ)
@@ -818,7 +818,7 @@ LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 	$(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
 
 CLIENT_OBJ1 = client/client.o client/clitar.o rpc_client/cli_pipe.o \
-	      librpc/rpc/binding.o \
+	      ../librpc/rpc/binding.o \
 	      client/dnsbrowse.o \
 	      $(RPC_CLIENT_OBJ1) \
 	      $(RPC_PARSE_OBJ2)
@@ -1111,7 +1111,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
 		$(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1)
 
 
-VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2) $(RPC_CLIENT_OBJ) librpc/rpc/binding.o
+VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2) $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o
 
 VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
@@ -1129,7 +1129,7 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
 		   $(RPC_PARSE_OBJ2) \
 		   $(RPC_CLIENT_OBJ1) \
 		   rpc_client/cli_pipe.o \
-		   librpc/rpc/binding.o \
+		   ../librpc/rpc/binding.o \
 		   $(LIBMSRPC_GEN_OBJ)
 
 
diff --git a/source3/librpc/tools/ndrdump.c b/source3/librpc/tools/ndrdump.c
index 08b969a..5b96e15 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);


-- 
Samba Shared Repository