[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2500-gd634d78

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  d634d78cdfbfa9e27cf9cb5ada3c5220be257a7f (commit)
      from  e2f1a43a3a331057c51256aa8956574c028d376f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit d634d78cdfbfa9e27cf9cb5ada3c5220be257a7f
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Jun 2 15:26:37 2008 -0700

    Fix by Bo Yang <boyang at novell.com> for bug with winbindd trusted domain child
    not keeping primary domain online status up to date.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/winbindd/winbindd_dual.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index b8c0ab9..29849e9 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -965,6 +965,7 @@ static bool fork_domain_child(struct winbindd_child *child)
 	int fdpair[2];
 	struct winbindd_cli_state state;
 	struct winbindd_domain *domain;
+	struct winbindd_domain *primary_domain = NULL;
 
 	if (child->domain) {
 		DEBUG(10, ("fork_domain_child called for domain '%s'\n",
@@ -1060,10 +1061,13 @@ static bool fork_domain_child(struct winbindd_child *child)
 	}
 
 	/* Ensure we have no pending check_online events other
-	   than one for this domain. */
+	   than one for this domain or the primary domain. */
 
 	for (domain = domain_list(); domain; domain = domain->next) {
-		if (domain != child->domain) {
+		if (domain->primary) {
+			primary_domain = domain;
+		}
+		if ((domain != child->domain) && !domain->primary) {
 			TALLOC_FREE(domain->check_online_event);
 		}
 	}
@@ -1080,6 +1084,18 @@ static bool fork_domain_child(struct winbindd_child *child)
 
 		set_domain_online_request(child->domain);
 
+		if (primary_domain != child->domain) {
+			/* We need to talk to the primary
+			 * domain as well as the trusted
+			 * domain inside a trusted domain
+			 * child.
+			 * See the code in :
+			 * set_dc_type_and_flags_trustinfo()
+			 * for details.
+			 */
+			set_domain_online_request(primary_domain);
+		}
+
 		child->lockout_policy_event = event_add_timed(
 			winbind_event_context(), NULL, timeval_zero(),
 			"account_lockout_policy_handler",


-- 
Samba Shared Repository