r24540: rename struct dcerpc_endpoint_list/struct dcerpc_authservice_list

into ndr_interface_string_array and move it to libndr.h

metze
(This used to be commit 473bca74dc9d9dc54a239c9b5d3dc5fcf5a117a9)

3 files changed, 9 insertions, 14 deletions

diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 16d215e053..c49165e8cb 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -299,6 +299,11 @@ struct ndr_interface_call {
 	BOOL async;
 };
 
+struct ndr_interface_string_array {
+	uint32_t count;
+	const char * const *names;
+};
+
 /* FIXME: Use represent_as instead */
 struct dom_sid;
 NTSTATUS ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 29f1ad013c..3be0ba7731 100644
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -158,24 +158,14 @@ struct dcerpc_pipe {
 /* this triggers the DCERPC_PFC_FLAG_CONC_MPX flag in the bind request */
 #define DCERPC_CONCURRENT_MULTIPLEX     (1<<19)
 
-struct dcerpc_endpoint_list {
-	uint32_t count;
-	const char * const *names;
-};
-
-struct dcerpc_authservice_list {
-	uint32_t count;
-	const char * const *names;
-};
-
 struct dcerpc_interface_table {
 	const char *name;
 	struct ndr_syntax_id syntax_id;
 	const char *helpstring;
 	uint32_t num_calls;
 	const struct ndr_interface_call *calls;
-	const struct dcerpc_endpoint_list *endpoints;
-	const struct dcerpc_authservice_list *authservices;
+	const struct ndr_interface_string_array *endpoints;
+	const struct ndr_interface_string_array *authservices;
 };
 
 struct dcerpc_interface_list {
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 51273104aa..1e701b9a0e 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2307,7 +2307,7 @@ sub FunctionTable($$)
 	$self->pidl("};");
 	$self->pidl("");
 
-	$self->pidl("static const struct dcerpc_endpoint_list $interface->{NAME}\_endpoints = {");
+	$self->pidl("static const struct ndr_interface_string_array $interface->{NAME}\_endpoints = {");
 	$self->pidl("\t.count\t= $endpoint_count,");
 	$self->pidl("\t.names\t= $interface->{NAME}\_endpoint_strings");
 	$self->pidl("};");
@@ -2327,7 +2327,7 @@ sub FunctionTable($$)
 	$self->pidl("};");
 	$self->pidl("");
 
-	$self->pidl("static const struct dcerpc_authservice_list $interface->{NAME}\_authservices = {");
+	$self->pidl("static const struct ndr_interface_string_array $interface->{NAME}\_authservices = {");
 	$self->pidl("\t.count\t= $endpoint_count,");
 	$self->pidl("\t.names\t= $interface->{NAME}\_authservice_strings");
 	$self->pidl("};");