r12858: This moves the libnet_LookupPdc code to use a GetDC request to find

the remote server's name, or in the absence of a local nbt_server to
communicate with (or without root access), a node status request.

The result is that we are in a better position to use kerberos, as well
as to remove the 'password server' mandatory parameter for the samsync
and samdump commands.  (I need this to put these into SWAT).

The only problem I have is that I must create a messaging context, which
requires a server ID.  As a client process, I don't expect to get
messages, but it is currently required for replies, so I generate a
random() number.  We probably need the servers to accept connections on
streamed sockets too, for client-only tasks that want IRPC.

Because I wanted to test this code, I have put the NET-API-* tests into
our test scripts, to ensure they pass and keep passing.  They are good
frontends onto the libnet system, and I see no reason not to test them.

In doing so the NET-API-RPCCONNECT test was simplified to take a
binding string on the command line, removing duplicate code, and
testing the combinations in the scripts instead.

(I have done a bit of work on the list shares code in libnet_share.c
to make it pass 'make test')

In the future, I would like to extend the libcli/findds.c code (based
off volker's winbind/wb_async_helpers.c, which is why it shows up a bit
odd in the patch) to handle getting multiple name replies, sending a
getdc request to each in turn.

(posted to samba-technical for review, and I'll happily update with
any comments)

Andrew Bartlett
(This used to be commit 7ccddfd3515fc2c0d6f447c768ccbf7a220c3380)

1 files changed, 34 insertions, 11 deletions

diff --git a/source4/libnet/libnet_rpc.c b/source4/libnet/libnet_rpc.c
index 6b94734f9b..ffed674f1f 100644
--- a/source4/libnet/libnet_rpc.c
+++ b/source4/libnet/libnet_rpc.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
-
+#include "libcli/libcli.h"
 
 /**
  * Connects rpc pipe on remote server
@@ -39,9 +39,10 @@ static NTSTATUS libnet_RpcConnectSrv(struct libnet_context *ctx, TALLOC_CTX *mem
 
 	/* prepare binding string */
 	switch (r->level) {
+	case LIBNET_RPC_CONNECT_DC:
 	case LIBNET_RPC_CONNECT_PDC:
 	case LIBNET_RPC_CONNECT_SERVER:
-		binding = talloc_asprintf(mem_ctx, "ncacn_np:%s", r->in.domain_name);
+		binding = talloc_asprintf(mem_ctx, "ncacn_np:%s", r->in.name);
 		break;
 
 	case LIBNET_RPC_CONNECT_BINDING:
@@ -81,24 +82,45 @@ static NTSTATUS libnet_RpcConnectPdc(struct libnet_context *ctx, TALLOC_CTX *mem
 {
 	NTSTATUS status;
 	struct libnet_RpcConnect r2;
-	struct libnet_Lookup f;
+	struct libnet_LookupDCs f;
+	const char *connect_name;
 
-	f.in.hostname  = r->in.domain_name;
-	f.in.methods   = NULL;
-	f.out.address  = NULL;
+	f.in.domain_name  = r->in.name;
+	switch (r->level) {
+	case LIBNET_RPC_CONNECT_PDC:
+		f.in.name_type = NBT_NAME_PDC;
+		break;
+	case LIBNET_RPC_CONNECT_DC:
+		f.in.name_type = NBT_NAME_LOGON;
+		break;
+	default:
+		break;
+	}
+	f.out.num_dcs = 0;
+	f.out.dcs  = NULL;
 
 	/* find the domain pdc first */
-	status = libnet_LookupPdc(ctx, mem_ctx, &f);
+	status = libnet_LookupDCs(ctx, mem_ctx, &f);
 	if (!NT_STATUS_IS_OK(status)) {
-		r->out.error_string = talloc_asprintf(mem_ctx, "libnet_LookupPdc failed: %s",
+		r->out.error_string = talloc_asprintf(mem_ctx, "libnet_LookupDCs failed: %s",
 						      nt_errstr(status));
 		return status;
 	}
 
+	/* we might not have got back a name.  Fall back to the IP */
+	if (f.out.dcs[0].name) {
+		connect_name = f.out.dcs[0].name;
+	} else {
+		connect_name = f.out.dcs[0].address;
+	}
+
 	/* ok, pdc has been found so do attempt to rpc connect */
-	r2.level		    = LIBNET_RPC_CONNECT_SERVER;
-	r2.in.domain_name	    = talloc_strdup(mem_ctx, f.out.address[0]);
-	r2.in.dcerpc_iface     = r->in.dcerpc_iface;
+	r2.level	    = LIBNET_RPC_CONNECT_SERVER;
+
+	/* This will cause yet another name resolution, but at least
+	 * we pass the right name down the stack now */
+	r2.in.name	    = talloc_strdup(mem_ctx, connect_name);
+	r2.in.dcerpc_iface  = r->in.dcerpc_iface;
 	
 	status = libnet_RpcConnect(ctx, mem_ctx, &r2);
 
@@ -130,6 +152,7 @@ NTSTATUS libnet_RpcConnect(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
 			return libnet_RpcConnectSrv(ctx, mem_ctx, r);
 
 		case LIBNET_RPC_CONNECT_PDC:
+		case LIBNET_RPC_CONNECT_DC:
 			return libnet_RpcConnectPdc(ctx, mem_ctx, r);
 	}