Attachment 5599 Details for Bug 7316 – Patch for v3-4

[patch] Patch for v3-4

tmp.diff (text/plain), 3.13 KB, created by Stefan Metzmacher on 2010-04-06 09:04:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2010-04-06 09:04:14 UTC

Size: 3.13 KB

patch

obsolete

>From ffcf5f8c22f8bcc6d8f88a617de51b95bd57d180 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 1 Apr 2010 09:29:38 +0200
>Subject: [PATCH] s3:winbindd: make sure we don't try rpc requests against unaccessable domains
>
>This makes sure we don't crash while trying to dereference domain->conn.cli->foo
>while trying to establish a rpc connection to the server.
>
>This fixes bug #7316.
>
>metze
>(cherry picked from commit d930904b997d310aeff781bde1e7e3ce47dde8a1)
>(cherry picked from commit 01b60b113869f526dcf3bb478d70df21dbb207c8)
>---
> source3/winbindd/winbindd_cm.c |   33 ++++++++++++++++++++++++++++-----
> 1 files changed, 28 insertions(+), 5 deletions(-)
>
>diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
>index 2ef077d..5829718 100644
>--- a/source3/winbindd/winbindd_cm.c
>+++ b/source3/winbindd/winbindd_cm.c
>@@ -1617,7 +1617,13 @@ static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain)
> 	NTSTATUS result;
> 
> 	/* Internal connections never use the network. */
>-	if (domain->internal || !winbindd_can_contact_domain(domain)) {
>+	if (domain->internal) {
>+		domain->initialized = True;
>+		return NT_STATUS_OK;
>+	}
>+
>+	if (!winbindd_can_contact_domain(domain)) {
>+		invalidate_cm_connection(&domain->conn);
> 		domain->initialized = True;
> 		return NT_STATUS_OK;
> 	}
>@@ -1650,6 +1656,23 @@ NTSTATUS init_dc_connection(struct winbindd_domain *domain)
> 	return init_dc_connection_network(domain);
> }
> 
>+static NTSTATUS init_dc_connection_rpc(struct winbindd_domain *domain)
>+{
>+	NTSTATUS status;
>+
>+	status = init_dc_connection(domain);
>+	if (!NT_STATUS_IS_OK(status)) {
>+		return status;
>+	}
>+
>+	if (!domain->internal && domain->conn.cli == NULL) {
>+		/* happens for trusted domains without inbound trust */
>+		return NT_STATUS_TRUSTED_DOMAIN_FAILURE;
>+	}
>+
>+	return NT_STATUS_OK;
>+}
>+
> /******************************************************************************
>  Set the trust flags (direction and forest location) for a domain
> ******************************************************************************/
>@@ -1996,7 +2019,7 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
> 	char *machine_account = NULL;
> 	char *domain_name = NULL;
> 
>-	result = init_dc_connection(domain);
>+	result = init_dc_connection_rpc(domain);
> 	if (!NT_STATUS_IS_OK(result)) {
> 		return result;
> 	}
>@@ -2179,7 +2202,7 @@ NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain,
> 
> 	DEBUG(10,("cm_connect_lsa_tcp\n"));
> 
>-	status = init_dc_connection(domain);
>+	status = init_dc_connection_rpc(domain);
> 	if (!NT_STATUS_IS_OK(status)) {
> 		return status;
> 	}
>@@ -2225,7 +2248,7 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
> 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
> 	struct dcinfo *p_dcinfo;
> 
>-	result = init_dc_connection(domain);
>+	result = init_dc_connection_rpc(domain);
> 	if (!NT_STATUS_IS_OK(result))
> 		return result;
> 
>@@ -2357,7 +2380,7 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
> 
> 	*cli = NULL;
> 
>-	result = init_dc_connection(domain);
>+	result = init_dc_connection_rpc(domain);
> 	if (!NT_STATUS_IS_OK(result)) {
> 		return result;
> 	}
>-- 
>1.6.3.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 7316: 5585 | 5599