s4:torture/libnet: make use of dcerpc_binding_get_string_option("host")

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

4 files changed, 10 insertions, 7 deletions

diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c
index 077d6a9f630..b330918b38a 100644
--- a/source4/torture/libnet/libnet_domain.c
+++ b/source4/torture/libnet/libnet_domain.c
@@ -394,7 +394,7 @@ bool torture_domain_list(struct torture_context *torture)
 	 */
 
 	ZERO_STRUCT(r);
-	r.in.hostname = binding->host;
+	r.in.hostname = dcerpc_binding_get_string_option(binding, "host");
 
 	status = libnet_DomainList(ctx, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -415,7 +415,7 @@ bool torture_domain_list(struct torture_context *torture)
 	ctx->samr.buf_size = 32;
 
 	ZERO_STRUCT(r);
-	r.in.hostname = binding->host;
+	r.in.hostname = dcerpc_binding_get_string_option(binding, "host");
 
 	status = libnet_DomainList(ctx, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index 5359c1d7ef8..618acdee049 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -45,7 +45,7 @@ bool torture_lookup(struct torture_context *torture)
 	if (lookup.in.hostname == NULL) {
 		status = torture_rpc_binding(torture, &binding);
 		if (NT_STATUS_IS_OK(status)) {
-			lookup.in.hostname = binding->host;
+			lookup.in.hostname = dcerpc_binding_get_string_option(binding, "host");
 		}
 	}
 
@@ -89,7 +89,7 @@ bool torture_lookup_host(struct torture_context *torture)
 	if (lookup.in.hostname == NULL) {
 		status = torture_rpc_binding(torture, &binding);
 		if (NT_STATUS_IS_OK(status)) {
-			lookup.in.hostname = binding->host;
+			lookup.in.hostname = dcerpc_binding_get_string_option(binding, "host");
 		}
 	}
 
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index ca64d62c439..66171583485 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -138,13 +138,16 @@ bool torture_rpc_connect_srv(struct torture_context *torture)
 	const enum libnet_RpcConnect_level level = LIBNET_RPC_CONNECT_SERVER;
 	NTSTATUS status;
 	struct dcerpc_binding *binding;
+	const char *host;
 
 	status = torture_rpc_binding(torture, &binding);
 	if (!NT_STATUS_IS_OK(status)) {
 		return false;
 	}
 
-	return torture_rpc_connect(torture, level, NULL, binding->host);
+	host = dcerpc_binding_get_string_option(binding, "host");
+
+	return torture_rpc_connect(torture, level, NULL, host);
 }
 
 
diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index 3b04a1475ec..b9e969f366c 100644
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -144,7 +144,7 @@ bool torture_listshares(struct torture_context *torture)
 
 	torture_comment(torture, "Testing libnet_ListShare\n");
 
-	share.in.server_name = talloc_asprintf(mem_ctx, "%s", binding->host);
+	share.in.server_name = dcerpc_binding_get_string_option(binding, "host");
 
 	for (i = 0; i < ARRAY_SIZE(levels); i++) {
 		share.in.level = levels[i];
@@ -229,7 +229,7 @@ bool torture_delshare(struct torture_context *torture)
 		return false;
 	}
 
-	share.in.server_name	= binding->host;
+	share.in.server_name	= dcerpc_binding_get_string_option(binding, "host");
 	share.in.share_name	= TEST_SHARENAME;
 
 	status = libnet_DelShare(libnetctx, torture, &share);