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)

3 files changed, 27 insertions, 86 deletions

diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index b6f23fd58c..c95ee58e49 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -40,8 +40,7 @@ BOOL torture_lookup(void)
 
 	address = talloc_array(ctx, const char, 16);
 
-	lookup.in.hostname = lp_netbios_name();
-	lookup.in.methods  = lp_name_resolve_order();
+	lookup.in.hostname = lp_parm_string(-1, "torture", "host");
 	lookup.in.type     = NBT_NAME_CLIENT;
 	lookup.out.address = &address;
 
@@ -77,8 +76,7 @@ BOOL torture_lookup_host(void)
 
 	address = talloc_array(mem_ctx, const char, 16);
 
-	lookup.in.hostname = lp_netbios_name();
-	lookup.in.methods  = lp_name_resolve_order();
+	lookup.in.hostname = lp_parm_string(-1, "torture", "host");
 	lookup.out.address = &address;
 
 	status = libnet_LookupHost(ctx, mem_ctx, &lookup);
@@ -103,24 +101,28 @@ BOOL torture_lookup_pdc(void)
 	NTSTATUS status;
 	TALLOC_CTX *mem_ctx;
 	struct libnet_context *ctx;
-	struct libnet_Lookup lookup;
-	const char *address;
+	struct libnet_LookupDCs *lookup;
 
 	mem_ctx = talloc_init("test_lookup_pdc");
 
 	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
 
-	address = talloc_array(mem_ctx, const char, 16);
+	talloc_steal(ctx, mem_ctx);
 
-	lookup.in.hostname = lp_workgroup();
-	lookup.in.methods  = lp_name_resolve_order();
-	lookup.out.address = &address;
+	lookup = talloc(mem_ctx, struct libnet_LookupDCs);
+	if (!lookup) {
+		ret = False;
+		goto done;
+	}
+
+	lookup->in.domain_name = lp_workgroup();
+	lookup->in.name_type   = NBT_NAME_PDC;
 
-	status = libnet_LookupPdc(ctx, mem_ctx, &lookup);
+	status = libnet_LookupDCs(ctx, mem_ctx, lookup);
 
 	if (!NT_STATUS_IS_OK(status)) {
-		printf("Couldn't lookup pdc %s: %s\n", lookup.in.hostname, nt_errstr(status));
+		printf("Couldn't lookup pdc %s: %s\n", lookup->in.domain_name, nt_errstr(status));
 		ret = False;
 		goto done;
 	}
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index 99055fac0d..418f579728 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -24,20 +24,19 @@
 #include "libnet/libnet.h"
 
 
-BOOL test_lsa_np_connect(struct libnet_context *ctx)
+static BOOL test_lsa_connect(struct libnet_context *ctx)
 {
 	NTSTATUS status;
 	struct libnet_RpcConnect connect;
 	connect.level            = LIBNET_RPC_CONNECT_BINDING;
-	connect.in.domain_name   = lp_workgroup();
-	connect.in.binding       = talloc_asprintf(ctx, "ncacn_np:%s", lp_workgroup());
+	connect.in.binding       = lp_parm_string(-1, "torture", "binding");
 	connect.in.dcerpc_iface  = &dcerpc_table_lsarpc;
 
 	status = libnet_RpcConnect(ctx, ctx, &connect);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Couldn't connect to rpc service %s on %s: %s\n",
-		       connect.in.dcerpc_iface->name, connect.in.domain_name,
+		       connect.in.dcerpc_iface->name, connect.in.binding,
 		       nt_errstr(status));
 
 		return False;
@@ -47,20 +46,19 @@ BOOL test_lsa_np_connect(struct libnet_context *ctx)
 }
 
 
-BOOL test_samr_np_connect(struct libnet_context *ctx)
+static BOOL test_samr_connect(struct libnet_context *ctx)
 {
 	NTSTATUS status;
 	struct libnet_RpcConnect connect;
 	connect.level            = LIBNET_RPC_CONNECT_BINDING;
-	connect.in.domain_name   = lp_workgroup();
-	connect.in.binding       = talloc_asprintf(ctx, "ncacn_np:%s", lp_workgroup());
+	connect.in.binding       = lp_parm_string(-1, "torture", "binding");
 	connect.in.dcerpc_iface  = &dcerpc_table_samr;
 
 	status = libnet_RpcConnect(ctx, ctx, &connect);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("Couldn't connect to rpc service %s on %s: %s\n",
-		       connect.in.dcerpc_iface->name, connect.in.domain_name,
+		       connect.in.dcerpc_iface->name, connect.in.binding,
 		       nt_errstr(status));
 
 		return False;
@@ -69,53 +67,6 @@ BOOL test_samr_np_connect(struct libnet_context *ctx)
 	return True;
 }
 
-
-BOOL test_lsa_tcpip_connect(struct libnet_context *ctx)
-{
-	NTSTATUS status;
-	struct libnet_RpcConnect connect;
-	connect.level            = LIBNET_RPC_CONNECT_BINDING;
-	connect.in.domain_name   = lp_workgroup();
-	connect.in.binding       = talloc_asprintf(ctx, "ncacn_ip_tcp:%s", lp_netbios_name());
-	connect.in.dcerpc_iface  = &dcerpc_table_lsarpc;
-
-	status = libnet_RpcConnect(ctx, ctx, &connect);
-	
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("Couldn't connect to rpc service %s on %s: %s\n",
-		       connect.in.dcerpc_iface->name, connect.in.domain_name,
-		       nt_errstr(status));
-
-		return False;
-	}
-
-	return True;
-}
-
-
-BOOL test_samr_tcpip_connect(struct libnet_context *ctx)
-{
-	NTSTATUS status;
-	struct libnet_RpcConnect connect;
-	connect.level            = LIBNET_RPC_CONNECT_BINDING;
-	connect.in.domain_name   = lp_workgroup();
-	connect.in.binding       = talloc_asprintf(ctx, "ncacn_ip_tcp:%s", lp_netbios_name());
-	connect.in.dcerpc_iface  = &dcerpc_table_samr;
-
-	status = libnet_RpcConnect(ctx, ctx, &connect);
-	
-	if (!NT_STATUS_IS_OK(status)) {
-		printf("Couldn't connect to rpc service %s on %s: %s\n",
-		       connect.in.dcerpc_iface->name, connect.in.domain_name,
-		       nt_errstr(status));
-
-		return False;
-	}
-
-	return True;
-}
-
-
 BOOL torture_rpc_connect(void)
 {
 	struct libnet_context *ctx;
@@ -123,27 +74,15 @@ BOOL torture_rpc_connect(void)
 	ctx = libnet_context_init(NULL);
 	ctx->cred = cmdline_credentials;
 
-	printf("Testing connection to lsarpc interface via named pipe\n");
-	if (!test_lsa_np_connect(ctx)) {
-		printf("failed to connect lsarpc interface via named pipe\n");
-		return False;
-	}
-
-	printf("Testing connection to SAMR service via named pipe\n");
-	if (!test_samr_np_connect(ctx)) {
-		printf("failed to connect samr interface via named pipe\n");
-		return False;
-	}
-
-	printf("Testing connection to LSA service via tcp/ip\n");
-	if (!test_lsa_tcpip_connect(ctx)) {
-		printf("failed to connect lsarpc interface via tcp/ip\n");
+	printf("Testing connection to lsarpc interface\n");
+	if (!test_lsa_connect(ctx)) {
+		printf("failed to connect lsarpc interface\n");
 		return False;
 	}
 
-	printf("Testing connection to SAMR service via tcp/ip\n");
-	if (!test_samr_tcpip_connect(ctx)) {
-		printf("failed to connect samr interface via tcp/ip\n");
+	printf("Testing connection to SAMR service\n");
+	if (!test_samr_connect(ctx)) {
+		printf("failed to connect samr interface\n");
 		return False;
 	}
 
diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index 5489f42ac8..93919a4129 100644
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -148,7 +148,7 @@ BOOL torture_listshares(void)
 
 		status = libnet_ListShares(libnetctx, mem_ctx, &share);
 		if (!NT_STATUS_IS_OK(status)) {
-			printf("libnet_ListShare level %u failed - %s\n", share.in.level, nt_errstr(status));
+			printf("libnet_ListShare level %u failed - %s\n", share.in.level, share.out.error_string);
 			ret = False;
 			goto done;
 		}