r24552: merge from SAMBA_4_0:

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 f57d23d0f1b1c7a435f3a4ad801e58519cc92a77)

1 files changed, 7 insertions, 7 deletions

diff --git a/source3/librpc/tools/ndrdump.c b/source3/librpc/tools/ndrdump.c
index cbc97cab98..d120e33c07 100644
--- a/source3/librpc/tools/ndrdump.c
+++ b/source3/librpc/tools/ndrdump.c
@@ -28,7 +28,7 @@
 #endif
 
 static const struct ndr_interface_call *find_function(
-	const struct dcerpc_interface_table *p,
+	const struct ndr_interface_table *p,
 	const char *function)
 {
 	int i;
@@ -52,7 +52,7 @@ static const struct ndr_interface_call *find_function(
 
 static void show_pipes(void)
 {
-	const struct dcerpc_interface_list *l;
+	const struct ndr_interface_list *l;
 	printf("\nYou must specify a pipe\n");
 	printf("known pipes are:\n");
 	for (l=librpc_dcerpc_pipes();l;l=l->next) {
@@ -67,7 +67,7 @@ static void show_pipes(void)
 
 #endif
 
-static void show_functions(const struct dcerpc_interface_table *p)
+static void show_functions(const struct ndr_interface_table *p)
 {
 	int i;
 	printf("\nYou must specify a function\n");
@@ -104,9 +104,9 @@ static char *stdin_load(TALLOC_CTX *mem_ctx, size_t *size)
 	return result;
 }
 
-static const struct dcerpc_interface_table *load_iface_from_plugin(const char *plugin, const char *pipe_name)
+static const struct ndr_interface_table *load_iface_from_plugin(const char *plugin, const char *pipe_name)
 {
-	const struct dcerpc_interface_table *p;
+	const struct ndr_interface_table *p;
 	void *handle;
 	char *symbol;
 
@@ -117,7 +117,7 @@ static const struct dcerpc_interface_table *load_iface_from_plugin(const char *p
 	}
 
 	symbol = talloc_asprintf(NULL, "dcerpc_table_%s", pipe_name);
-	p = (const struct dcerpc_interface_table *)dlsym(handle, symbol);
+	p = (const struct ndr_interface_table *)dlsym(handle, symbol);
 
 	if (!p) {
 		printf("%s: Unable to find DCE/RPC interface table for '%s': %s\n", plugin, pipe_name, dlerror());
@@ -132,7 +132,7 @@ static const struct dcerpc_interface_table *load_iface_from_plugin(const char *p
 
  int main(int argc, const char *argv[])
 {
-	const struct dcerpc_interface_table *p = NULL;
+	const struct ndr_interface_table *p = NULL;
 	const struct ndr_interface_call *f;
 	const char *pipe_name, *function, *inout, *filename;
 	uint8_t *data;