svn commit: samba r24540 - in branches/SAMBA_4_0/source: librpc/ndr
librpc/rpc pidl/lib/Parse/Pidl/Samba4/NDR
metze at samba.org
metze at samba.org
Sat Aug 18 12:25:40 GMT 2007
Author: metze
Date: 2007-08-18 12:25:37 +0000 (Sat, 18 Aug 2007)
New Revision: 24540
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24540
Log:
rename struct dcerpc_endpoint_list/struct dcerpc_authservice_list
into ndr_interface_string_array and move it to libndr.h
metze
Modified:
branches/SAMBA_4_0/source/librpc/ndr/libndr.h
branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2007-08-18 10:34:01 UTC (rev 24539)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2007-08-18 12:25:37 UTC (rev 24540)
@@ -299,6 +299,11 @@
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);
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h 2007-08-18 10:34:01 UTC (rev 24539)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.h 2007-08-18 12:25:37 UTC (rev 24540)
@@ -158,24 +158,14 @@
/* 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 {
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm 2007-08-18 10:34:01 UTC (rev 24539)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm 2007-08-18 12:25:37 UTC (rev 24540)
@@ -2307,7 +2307,7 @@
$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 @@
$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("};");
More information about the samba-cvs
mailing list