Attachment 293489 Details for Bug 429024 – New patch to fix the problem

[patch] New patch to fix the problem

sambadc_winbindd_is_dc.patch (text/plain), 1.44 KB, created by Simo Sorce on 2008-01-30 21:42:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simo Sorce

Created: 2008-01-30 21:42:05 UTC

Size: 1.44 KB

patch

obsolete

>diff --git a/source/nsswitch/winbindd_dual.c b/source/nsswitch/winbindd_dual.c
>index ffbedfa..fa6add3 100644
>--- a/source/nsswitch/winbindd_dual.c
>+++ b/source/nsswitch/winbindd_dual.c
>@@ -35,6 +35,7 @@
> #define DBGC_CLASS DBGC_WINBIND
> 
> extern BOOL override_logfile;
>+extern struct winbindd_methods cache_methods;
> 
> /* Read some data from a client connection */
> 
>@@ -988,6 +989,16 @@ static BOOL fork_domain_child(struct winbindd_child *child)
> 			child);
> 	}
> 
>+	/* Special case for Winbindd on a Samba DC,
>+	 * We want to make sure the child can connect to smbd
>+	 * but not the main daemon */
>+
>+	if (child->domain && child->domain->internal && IS_DC) {
>+		child->domain->internal = False;
>+		child->domain->methods = &cache_methods;
>+		child->domain->online = False;
>+	}
>+
> 	while (1) {
> 
> 		int ret;
>diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
>index d2daf78..ecd919d 100644
>--- a/source/nsswitch/winbindd_util.c
>+++ b/source/nsswitch/winbindd_util.c
>@@ -83,9 +83,6 @@ static BOOL is_internal_domain(const DOM_SID *sid)
> 	if (sid == NULL)
> 		return False;
> 
>-	if ( IS_DC )
>-		return sid_check_is_builtin(sid);
>-
> 	return (sid_check_is_domain(sid) || sid_check_is_builtin(sid));
> }
> 
>@@ -94,9 +91,6 @@ static BOOL is_in_internal_domain(const DOM_SID *sid)
> 	if (sid == NULL)
> 		return False;
> 
>-	if ( IS_DC )
>-		return sid_check_is_in_builtin(sid);
>-
> 	return (sid_check_is_in_our_domain(sid) || sid_check_is_in_builtin(sid));
> }
>

Actions: View | Diff

Attachments on bug 429024: 291892 | 291893 | 291897 | 291898 | 292014 | 292015 | 292202 | 292203 | 293489 | 293625 | 293626 | 295318 | 299950 | 300141