Attachment 11349 Details for Bug 11454 – Patch for v4-2-test

[patch] Patch for v4-2-test

tmp42.diff.txt (text/plain), 3.26 KB, created by Stefan Metzmacher on 2015-08-18 06:18:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2015-08-18 06:18:15 UTC

Size: 3.26 KB

patch

obsolete

>From 8b06859b0f35b774ed1e4b19a61739ef9c33fce6 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 22 Jan 2015 11:22:25 +0000
>Subject: [PATCH] s4:rpc_server/netlogon: fix bugs in
> dcesrv_netr_DsRGetDCNameEx2()
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>We should return the our ip address the client is connected too.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: GÃ¼nther Deschner <gd@samba.org>
>(cherry picked from commit 459d1d3fb9a5282d19121eaacba9d611896b37ff)
>---
> source4/rpc_server/netlogon/dcerpc_netlogon.c | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
>diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
>index 3ea26e2..b2f0073 100644
>--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
>+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
>@@ -1828,15 +1828,16 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call,
> 	struct ldb_context *sam_ctx;
> 	struct netr_DsRGetDCNameInfo *info;
> 	struct loadparm_context *lp_ctx = dce_call->conn->dce_ctx->lp_ctx;
>+	const struct tsocket_address *local_address;
>+	char *local_addr = NULL;
> 	const struct tsocket_address *remote_address;
>-	char *addr = NULL;
>+	char *remote_addr = NULL;
> 	const char *server_site_name;
> 	char *guid_str;
> 	struct netlogon_samlogon_response response;
> 	NTSTATUS status;
> 	const char *dc_name = NULL;
> 	const char *domain_name = NULL;
>-	struct interface *ifaces;
> 	const char *pdc_ip;
> 
> 	ZERO_STRUCTP(r->out.info);
>@@ -1847,10 +1848,16 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call,
> 		return WERR_DS_UNAVAILABLE;
> 	}
> 
>+	local_address = dcesrv_connection_get_local_address(dce_call->conn);
>+	if (tsocket_address_is_inet(local_address, "ip")) {
>+		local_addr = tsocket_address_inet_addr_string(local_address, mem_ctx);
>+		W_ERROR_HAVE_NO_MEMORY(local_addr);
>+	}
>+
> 	remote_address = dcesrv_connection_get_remote_address(dce_call->conn);
> 	if (tsocket_address_is_inet(remote_address, "ip")) {
>-		addr = tsocket_address_inet_addr_string(remote_address, mem_ctx);
>-		W_ERROR_HAVE_NO_MEMORY(addr);
>+		remote_addr = tsocket_address_inet_addr_string(remote_address, mem_ctx);
>+		W_ERROR_HAVE_NO_MEMORY(remote_addr);
> 	}
> 
> 	/* "server_unc" is ignored by w2k3 */
>@@ -1908,7 +1915,7 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call,
> 						 r->in.domain_name,
> 						 NULL, guid_str,
> 						 r->in.client_account,
>-						 r->in.mask, addr,
>+						 r->in.mask, remote_addr,
> 						 NETLOGON_NT_VERSION_5EX_WITH_IP,
> 						 lp_ctx, &response, true);
> 	if (!NT_STATUS_IS_OK(status)) {
>@@ -1956,12 +1963,11 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call,
> 	info = talloc(mem_ctx, struct netr_DsRGetDCNameInfo);
> 	W_ERROR_HAVE_NO_MEMORY(info);
> 	info->dc_unc = talloc_asprintf(mem_ctx, "%s%s",
>-			dc_name[0] == '\\'? "\\\\":"",
>+			dc_name[0] != '\\'? "\\\\":"",
> 			talloc_strdup(mem_ctx, dc_name));
> 	W_ERROR_HAVE_NO_MEMORY(info->dc_unc);
> 
>-	load_interface_list(mem_ctx, lp_ctx, &ifaces);
>-	pdc_ip = iface_list_best_ip(ifaces, addr);
>+	pdc_ip = local_addr;
> 	if (pdc_ip == NULL) {
> 		pdc_ip = "127.0.0.1";
> 	}
>-- 
>1.9.1
>

Flags:

metze: review? (slow)
gd: review+

Actions: View

Attachments on bug 11454: 11349