r24551: rename dcerpc_interface_table -> ndr_interface_table

rename dcerpc_interface_list  -> ndr_interface_list

and move them to libndr.h

metze
(This used to be commit 4adbebef5df2f833d2d4bfcdda72a34179d52f5c)

8 files changed, 23 insertions, 23 deletions

diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index a78cd38893..c61954f268 100644
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -33,7 +33,7 @@ BOOL torture_rpc_alter_context(struct torture_context *torture)
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
 	struct policy_handle *handle;
-	struct dcerpc_interface_table tmptbl;
+	struct ndr_interface_table tmptbl;
 	struct ndr_syntax_id syntax;
 	struct ndr_syntax_id transfer_syntax;
 
diff --git a/source4/torture/rpc/async_bind.c b/source4/torture/rpc/async_bind.c
index 36b0756208..585266219c 100644
--- a/source4/torture/rpc/async_bind.c
+++ b/source4/torture/rpc/async_bind.c
@@ -47,7 +47,7 @@ BOOL torture_async_bind(struct torture_context *torture)
 
 	struct composite_context **bind_req;
 	struct dcerpc_pipe **pipe;
-	const struct dcerpc_interface_table **table;
+	const struct ndr_interface_table **table;
 
 	if (!torture_setting_bool(torture, "async", False)) {
 		printf("async bind test disabled - enable async tests to use\n");
@@ -64,7 +64,7 @@ BOOL torture_async_bind(struct torture_context *torture)
 	if (bind_req == NULL) return False;
 	pipe     = talloc_array(torture, struct dcerpc_pipe*, torture_numasync);
 	if (pipe == NULL) return False;
-	table    = talloc_array(torture, const struct dcerpc_interface_table*, torture_numasync);
+	table    = talloc_array(torture, const struct ndr_interface_table*, torture_numasync);
 	if (table == NULL) return False;
 	
 	/* credentials */
diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index 28b45560f6..d6011265e7 100644
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -89,7 +89,7 @@ static void fill_blob_handle(DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
 
 static void reopen(TALLOC_CTX *mem_ctx, 
 		   struct dcerpc_pipe **p, 
-		   const struct dcerpc_interface_table *iface)
+		   const struct ndr_interface_table *iface)
 {
 	NTSTATUS status;
 
@@ -111,10 +111,10 @@ static void print_depth(int depth)
 	}
 }
 
-static void test_ptr_scan(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_table *iface, 
+static void test_ptr_scan(TALLOC_CTX *mem_ctx, const struct ndr_interface_table *iface, 
 			  int opnum, DATA_BLOB *base_in, int min_ofs, int max_ofs, int depth);
 
-static void try_expand(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_table *iface, 
+static void try_expand(TALLOC_CTX *mem_ctx, const struct ndr_interface_table *iface, 
 		       int opnum, DATA_BLOB *base_in, int insert_ofs, int depth)
 {
 	DATA_BLOB stub_in, stub_out;
@@ -156,7 +156,7 @@ static void try_expand(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_table
 }
 
 
-static void test_ptr_scan(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_table *iface, 
+static void test_ptr_scan(TALLOC_CTX *mem_ctx, const struct ndr_interface_table *iface, 
 			  int opnum, DATA_BLOB *base_in, int min_ofs, int max_ofs, int depth)
 {
 	DATA_BLOB stub_in, stub_out;
@@ -196,7 +196,7 @@ static void test_ptr_scan(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_tab
 }
 	
 
-static void test_scan_call(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_table *iface, int opnum)
+static void test_scan_call(TALLOC_CTX *mem_ctx, const struct ndr_interface_table *iface, int opnum)
 {
 	DATA_BLOB stub_in, stub_out;
 	int i;
@@ -254,7 +254,7 @@ static void test_scan_call(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_ta
 }
 
 
-static void test_auto_scan(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_table *iface)
+static void test_auto_scan(TALLOC_CTX *mem_ctx, const struct ndr_interface_table *iface)
 {
 	test_scan_call(mem_ctx, iface, 2);
 }
@@ -262,7 +262,7 @@ static void test_auto_scan(TALLOC_CTX *mem_ctx, const struct dcerpc_interface_ta
 BOOL torture_rpc_autoidl(struct torture_context *torture)
 {
 	TALLOC_CTX *mem_ctx;
-	const struct dcerpc_interface_table *iface;
+	const struct ndr_interface_table *iface;
 		
 	iface = idl_iface_by_name("drsuapi");
 	if (!iface) {
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index e081d0d625..e400fcdbe3 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -29,7 +29,7 @@
 
 	
 BOOL count_calls(TALLOC_CTX *mem_ctx,
-		 const struct dcerpc_interface_table *iface,
+		 const struct ndr_interface_table *iface,
 	BOOL all) 
 {
 	struct dcerpc_pipe *p;
@@ -102,10 +102,10 @@ BOOL count_calls(TALLOC_CTX *mem_ctx,
 
 BOOL torture_rpc_countcalls(struct torture_context *torture)
 {
-	const struct dcerpc_interface_table *iface;
+	const struct ndr_interface_table *iface;
 	const char *iface_name;
 	BOOL ret = True;
-	const struct dcerpc_interface_list *l;
+	const struct ndr_interface_list *l;
 	TALLOC_CTX *mem_ctx = talloc_named(torture, 0, "torture_rpc_countcalls context");
 	if (!mem_ctx) {
 		return False;
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 80388f319d..62150de33b 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -30,7 +30,7 @@
   ask the server what interface IDs are available on this endpoint
 */
 BOOL test_inq_if_ids(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-		     BOOL (*per_id_test)(const struct dcerpc_interface_table *iface,
+		     BOOL (*per_id_test)(const struct ndr_interface_table *iface,
 					 TALLOC_CTX *mem_ctx,
 					 struct ndr_syntax_id *id),
 		     const void *priv)
@@ -194,7 +194,7 @@ BOOL torture_rpc_mgmt(struct torture_context *torture)
 	TALLOC_CTX *mem_ctx, *loop_ctx;
 	BOOL ret = True;
 	const char *binding = torture_setting_string(torture, "binding", NULL);
-	const struct dcerpc_interface_list *l;
+	const struct ndr_interface_list *l;
 	struct dcerpc_binding *b;
 
 	mem_ctx = talloc_init("torture_rpc_mgmt");
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 6f95e14301..dfb2e535aa 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -30,7 +30,7 @@
 /* open a rpc connection to the chosen binding string */
 _PUBLIC_ NTSTATUS torture_rpc_connection(TALLOC_CTX *parent_ctx, 
 				struct dcerpc_pipe **p, 
-				const struct dcerpc_interface_table *table)
+				const struct ndr_interface_table *table)
 {
         NTSTATUS status;
 	const char *binding = lp_parm_string(-1, "torture", "binding");
@@ -54,7 +54,7 @@ _PUBLIC_ NTSTATUS torture_rpc_connection(TALLOC_CTX *parent_ctx,
 /* open a rpc connection to a specific transport */
 NTSTATUS torture_rpc_connection_transport(TALLOC_CTX *parent_ctx, 
 					  struct dcerpc_pipe **p, 
-					  const struct dcerpc_interface_table *table,
+					  const struct ndr_interface_table *table,
 					  enum dcerpc_transport_t transport,
 					  uint32_t assoc_group_id)
 {
@@ -97,7 +97,7 @@ static bool torture_rpc_setup (struct torture_context *tctx, void **data)
 	
 	status = torture_rpc_connection(tctx, 
 				(struct dcerpc_pipe **)data, 
-				(const struct dcerpc_interface_table *)tctx->active_tcase->data);
+				(const struct ndr_interface_table *)tctx->active_tcase->data);
 
 	torture_assert_ntstatus_ok(tctx, status, "Error connecting to server");
 
@@ -112,7 +112,7 @@ static bool torture_rpc_teardown (struct torture_context *tcase, void *data)
 
 _PUBLIC_ struct torture_tcase *torture_suite_add_rpc_iface_tcase(struct torture_suite *suite, 
 								const char *name,
-								const struct dcerpc_interface_table *table)
+								const struct ndr_interface_table *table)
 {
 	struct torture_tcase *tcase = torture_suite_add_tcase(suite, name);
 
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 9e5eedab3a..f904d43ee4 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -1368,7 +1368,7 @@ BOOL torture_samba3_sessionkey(struct torture_context *torture)
 static NTSTATUS pipe_bind_smb(TALLOC_CTX *mem_ctx,
 			      struct smbcli_tree *tree,
 			      const char *pipe_name,
-			      const struct dcerpc_interface_table *iface,
+			      const struct ndr_interface_table *iface,
 			      struct dcerpc_pipe **p)
 {
 	struct dcerpc_pipe *result;
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index 62de0a9e63..6dee60d599 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -28,7 +28,7 @@
 /*
   work out how many calls there are for an interface
  */
-static BOOL test_num_calls(const struct dcerpc_interface_table *iface,
+static BOOL test_num_calls(const struct ndr_interface_table *iface,
 			   TALLOC_CTX *mem_ctx,
 			   struct ndr_syntax_id *id)
 {
@@ -37,7 +37,7 @@ static BOOL test_num_calls(const struct dcerpc_interface_table *iface,
 	int i;
 	DATA_BLOB stub_in, stub_out;
 	int idl_calls;
-	struct dcerpc_interface_table tbl;
+	struct ndr_interface_table tbl;
 
 	/* FIXME: This should be fixed when torture_rpc_connection 
 	 * takes a ndr_syntax_id */
@@ -98,7 +98,7 @@ BOOL torture_rpc_scanner(struct torture_context *torture)
         struct dcerpc_pipe *p;
 	TALLOC_CTX *mem_ctx, *loop_ctx;
 	BOOL ret = True;
-	const struct dcerpc_interface_list *l;
+	const struct ndr_interface_list *l;
 	const char *binding = torture_setting_string(torture, "binding", NULL);
 	struct dcerpc_binding *b;