Attachment 5416 Details for Bug 7170 – Patch for v3-3

[patch] Patch for v3-3

tmp.diff (text/plain), 1.25 KB, created by Stefan Metzmacher on 2010-02-23 04:05:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2010-02-23 04:05:57 UTC

Size: 1.25 KB

patch

obsolete

>From 8ba72a32e4b69e9c3d270c15c9d40d1094276f54 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 23 Feb 2010 08:42:41 +0100
>Subject: [PATCH] s3:winbindd: never mark external domains as internal!
>
>This way we can endup with silently using builtin_passdb_methods
>for an ad domain without an inbound trust.
>
>This fixes bug #7170.
>
>metze
>(cherry picked from commit f924b7749280b31ece19885de1c3ad1bd71942ac)
>---
> source/winbindd/winbindd_cm.c |    5 +----
> 1 files changed, 1 insertions(+), 4 deletions(-)
>
>diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
>index bd502a5..0ca7167 100644
>--- a/source/winbindd/winbindd_cm.c
>+++ b/source/winbindd/winbindd_cm.c
>@@ -1618,7 +1618,7 @@ static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain)
> 	NTSTATUS result;
> 
> 	/* Internal connections never use the network. */
>-	if (domain->internal) {
>+	if (domain->internal || !winbindd_can_contact_domain(domain)) {
> 		domain->initialized = True;
> 		return NT_STATUS_OK;
> 	}
>@@ -1746,9 +1746,6 @@ static bool set_dc_type_and_flags_trustinfo( struct winbindd_domain *domain )
> 
> 			domain->initialized = True;
> 
>-			if ( !winbindd_can_contact_domain( domain) )
>-				domain->internal = True;
>-			
> 			break;
> 		}		
> 	}
>-- 
>1.6.3.3
>

Flags:

obnox: review+

Actions: View

Attachments on bug 7170: 5414 | 5415 | 5416