This patch adds a better dcerpc server infastructure.

1.) We now register endpoint servers add startup via register_backend()
    and later use the smb.conf 'dcerpc endpoint servers' parameter to setup the dcesrv_context

2.) each endpoint server can register at context creation time as much interfaces as it wants
    (multiple interfaces on one endpoint are supported!)
    (NOTE:  there's a difference between 'endpoint server' and 'endpoint'!
	    for details look at rpc_server/dcesrv_server.h)

3.) one endpoint can have a security descriptor registered to it self
    this will be checked in the future when a client wants to connect
    to an smb pipe endpoint.

4.) we now have a 'remote' endpoint server, which works like the ntvfs_cifs module
    it takes this options in the [globals] section:

    dcerpc remote:interfaces = srvsvc, winreg, w32time, epmapper
    dcerpc remote:binding = ...
    dcerpc remote:user = ...
    dcerpc remote:password = ...

5.) we currently have tree endpoint servers: epmapper, rpcecho and remote

    the default for the 'dcerpc endpiont servers = epmapper, rpcecho'

    for testing you can also do
    dcerpc endpoint servers = rpcecho, remote, epmapper
    dcerpc remote:interfaces = srvsvc, samr, netlogon

6,) please notice the the epmapper now only returns NO_ENTRIES
    (but I think we'll find a solution for this too:-)

7.) also there're some other stuff left, but step by step :-)

This patch also includes updates for the
register_subsystem() , ntvfs_init(), and some other funtions
to check for duplicate subsystem registration


metze

(hmmm, my first large commit...I hope it works as supposed :-)
(This used to be commit 917e45dafd5be4c2cd90ff425b8d6f8403122349)

4 files changed, 91 insertions, 33 deletions

diff --git a/source4/build/pidl/header.pm b/source4/build/pidl/header.pm
index 418ae97aed..c1b6eb44a1 100644
--- a/source4/build/pidl/header.pm
+++ b/source4/build/pidl/header.pm
@@ -278,7 +278,7 @@ sub HeaderInterface($)
 	    $res .= "#define DCERPC_$name\_VERSION $if_version\n";
 	    $res .= "#define DCERPC_$name\_NAME \"$interface->{NAME}\"\n\n";
 	    $res .= "extern const struct dcerpc_interface_table dcerpc_table_$interface->{NAME};\n";
-	    $res .= "void rpc_$interface->{NAME}_init(void *);\n\n";
+	    $res .= "NTSTATUS dcerpc_$interface->{NAME}_init(void);\n\n";
     }
 
     foreach my $d (@{$data}) {
diff --git a/source4/build/pidl/server.pm b/source4/build/pidl/server.pm
index f5256d18a6..0938515f48 100644
--- a/source4/build/pidl/server.pm
+++ b/source4/build/pidl/server.pm
@@ -1,6 +1,7 @@
 ###################################################
 # server boilerplate generator
 # Copyright tridge@samba.org 2003
+# Copyright metze@samba.org 2004
 # released under the GNU GPL
 
 package IdlServer;
@@ -16,7 +17,7 @@ sub pidl($)
 
 #####################################################################
 # produce boilerplate code for a interface
-sub Boilerplate($)
+sub Boilerplate_Iface($)
 {
 	my($interface) = shift;
 	my($data) = $interface->{DATA};
@@ -41,49 +42,105 @@ sub Boilerplate($)
 	pidl "\tNULL};\n\n";
 
 	pidl "
-static BOOL $name\_op_query_endpoint(const struct dcesrv_endpoint *ep)
+static NTSTATUS $name\_op_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface)
 {
-	return dcesrv_table_query(&dcerpc_table_$name, ep);
+	return NT_STATUS_OK;	
 }
 
-static BOOL $name\_op_set_interface(struct dcesrv_state *dce, 
-			     const char *uuid, uint32 if_version)
+static void $name\_op_unbind(struct dcesrv_connection *dce_conn, const struct dcesrv_interface *iface)
 {
-	return dcesrv_set_interface(dce, uuid, if_version, 
-				    &dcerpc_table_$name, $name\_dispatch_table);
+	return;	
 }
 
-static NTSTATUS $name\_op_connect(struct dcesrv_state *dce)
+static NTSTATUS $name\_op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r)
 {
+	uint16 opnum = dce_call->pkt.u.request.opnum;
+
+	return $name\_dispatch_table[opnum](dce_call, mem_ctx, r);	
+}
+
+static const struct dcesrv_interface $name\_interface = {
+	&dcerpc_table_$name,
+	$name\_op_bind,
+	$name\_op_unbind,
+	$name\_op_dispatch
+};
+
+";
+}
+
+#####################################################################
+# produce boilerplate code for an endpoint server
+sub Boilerplate_Ep_Server($)
+{
+	my($interface) = shift;
+	my($data) = $interface->{DATA};
+	my $count = 0;
+	my $name = $interface->{NAME};
+	my $uname = uc $name;
+
+	foreach my $d (@{$data}) {
+		if ($d->{TYPE} eq "FUNCTION") { $count++; }
+	}
+
+	if ($count == 0) {
+		return;
+	}
+
+	pidl "
+static NTSTATUS $name\_op_init_server(struct dcesrv_context *dce_ctx, const struct dcesrv_endpoint_server *ep_server)
+{
+	int i;
+
+	for (i=0;i<$name\_interface.ndr->endpoints->count;i++) {
+		NTSTATUS ret;
+		const char *name = $name\_interface.ndr->endpoints->names[i];
+
+		ret = dcesrv_interface_register(dce_ctx, name, &$name\_interface, NULL);
+		if (!NT_STATUS_IS_OK(ret)) {
+			DEBUG(1,(\"$name\_op_init_server: failed to register endpoint \'%s\'\\n\",name));
+			return ret;
+		}
+	}
+
 	return NT_STATUS_OK;
 }
 
-static void $name\_op_disconnect(struct dcesrv_state *dce)
+static BOOL $name\_op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32 if_version)
 {
-	/* nothing to do */
+	return False;	
 }
 
-static int $name\_op_lookup_endpoints(TALLOC_CTX *mem_ctx, struct dcesrv_ep_iface **e)
+static BOOL $name\_op_interface_by_name(struct dcesrv_interface *iface, const char *name)
 {
-	return dcesrv_lookup_endpoints(&dcerpc_table_$name, mem_ctx, e);
+	return False;	
 }
+	
+NTSTATUS dcerpc_$name\_init(void)
+{
+	NTSTATUS ret;
+	struct dcesrv_endpoint_server ep_server;
 
-static const struct dcesrv_endpoint_ops $name\_ops = {
-	$name\_op_query_endpoint,
-	$name\_op_set_interface,
-	$name\_op_connect,
-	$name\_op_disconnect,
-	$name\_op_lookup_endpoints
-};
+	/* fill in our name */
+	ep_server.name = \"$name\";
 
-void rpc_$name\_init(void *v)
-{
-	struct dcesrv_context *dce = v;
-	if (!dcesrv_endpoint_register(dce, &$name\_ops, 
-				      &dcerpc_table_$name)) {
-		DEBUG(1,(\"Failed to register rpcecho endpoint\\n\"));
+	/* fill in all the operations */
+	ep_server.init_server = $name\_op_init_server;
+
+	ep_server.interface_by_uuid = $name\_op_interface_by_uuid;
+	ep_server.interface_by_name = $name\_op_interface_by_name;
+
+	/* register ourselves with the NTVFS subsystem. */
+	ret = register_backend(\"dcerpc\", &ep_server);
+
+	if (!NT_STATUS_IS_OK(ret)) {
+		DEBUG(0,(\"Failed to register \'$name\' endpoint server!\\n\"));
+		return ret;
 	}
+
+	return ret;
 }
+
 ";
 }
 
@@ -95,9 +152,12 @@ sub Parse($)
 	my($idl) = shift;
 	$res = "/* dcerpc server boilerplate generated by pidl */\n\n";
 	foreach my $x (@{$idl}) {
-		($x->{TYPE} eq "INTERFACE") && 
-		    Boilerplate($x);
+		if ($x->{TYPE} eq "INTERFACE") { 
+			Boilerplate_Iface($x);
+			Boilerplate_Ep_Server($x);
+		}
 	}
+
 	return $res;
 }
 
diff --git a/source4/build/pidl/tables.pl b/source4/build/pidl/tables.pl
index fa53af1c09..bf1db20e28 100755
--- a/source4/build/pidl/tables.pl
+++ b/source4/build/pidl/tables.pl
@@ -60,7 +60,7 @@ sub process_file($)
 	close(FILE);
 }
 
-
+print "Creating $opt_output.[ch]\n";
 open(TABLEH, ">$opt_output.h") || die "failed to open $opt_output.h\n";
 open(TABLEC, ">$opt_output.c") || die "failed to open $opt_output.c\n";
 
diff --git a/source4/build/pidl/template.pm b/source4/build/pidl/template.pm
index f9f9897ce2..6e0decbf40 100644
--- a/source4/build/pidl/template.pm
+++ b/source4/build/pidl/template.pm
@@ -18,8 +18,7 @@ sub Template($)
 	my $name = $interface->{NAME};
 
 	$res .= 
-"
-/* 
+"/* 
    Unix SMB/CIFS implementation.
 
    endpoint server for the $name pipe
@@ -53,7 +52,7 @@ sub Template($)
 /* 
   $fname 
 */
-static NTSTATUS $fname(struct dcesrv_state *dce, TALLOC_CTX *mem_ctx, 
+static NTSTATUS $fname(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
 		       struct $fname *r)
 {
 	return NT_STATUS_NOT_IMPLEMENTED;
@@ -85,4 +84,3 @@ sub Parse($)
 }
 
 1;
-