svn commit: samba r21056 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_24/source/nsswitch

gd at samba.org gd at samba.org
Tue Jan 30 16:51:42 GMT 2007


Author: gd
Date: 2007-01-30 16:51:42 +0000 (Tue, 30 Jan 2007)
New Revision: 21056

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21056

Log:
Moving the set_domain_online_request to fork_domain_child() (formerly
lived in trustdom_recv(). 

Jeremy, this is the better place I think but please check.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
   branches/SAMBA_3_0_24/source/nsswitch/winbindd_dual.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2007-01-30 12:10:42 UTC (rev 21055)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2007-01-30 16:51:42 UTC (rev 21056)
@@ -842,15 +842,6 @@
 	/* The child is ok with online/offline messages now. */
 	message_unblock();
 
-	if (child->domain != NULL && lp_winbind_offline_logon()) {
-		/* We might be in the idmap child...*/
-		child->lockout_policy_event = event_add_timed(
-			winbind_event_context(), NULL, timeval_zero(),
-			"account_lockout_policy_handler",
-			account_lockout_policy_handler,
-			child);
-	}
-
 	/* Handle online/offline messages. */
 	message_register(MSG_WINBIND_OFFLINE,child_msg_offline);
 	message_register(MSG_WINBIND_ONLINE,child_msg_online);
@@ -878,6 +869,18 @@
 	cancel_named_event(winbind_event_context(),
 			   "krb5_ticket_refresh_handler");
 
+	/* We might be in the idmap child...*/
+	if (child->domain && lp_winbind_offline_logon()) {
+
+		set_domain_online_request(child->domain);
+
+		child->lockout_policy_event = event_add_timed(
+			winbind_event_context(), NULL, timeval_zero(),
+			"account_lockout_policy_handler",
+			account_lockout_policy_handler,
+			child);
+	}
+
 	while (1) {
 
 		int ret;

Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0_24/source/nsswitch/winbindd_dual.c	2007-01-30 12:10:42 UTC (rev 21055)
+++ branches/SAMBA_3_0_24/source/nsswitch/winbindd_dual.c	2007-01-30 16:51:42 UTC (rev 21056)
@@ -838,15 +838,6 @@
 	/* The child is ok with online/offline messages now. */
 	message_unblock();
 
-	if (child->domain != NULL && lp_winbind_offline_logon()) {
-		/* We might be in the idmap child...*/
-		child->lockout_policy_event = add_timed_event(
-			NULL, timeval_zero(),
-			"account_lockout_policy_handler",
-			account_lockout_policy_handler,
-			child);
-	}
-
 	/* Handle online/offline messages. */
 	message_register(MSG_WINBIND_OFFLINE,child_msg_offline);
 	message_register(MSG_WINBIND_ONLINE,child_msg_online);
@@ -873,6 +864,18 @@
 
 	cancel_named_event("krb5_ticket_refresh_handler");
 
+	/* We might be in the idmap child...*/
+	if (child->domain && lp_winbind_offline_logon()) {
+
+		set_domain_online_request(child->domain);
+
+		child->lockout_policy_event = event_add_timed(
+			NULL, timeval_zero(),
+			"account_lockout_policy_handler",
+			account_lockout_policy_handler,
+			child);
+	}
+
 	while (1) {
 
 		int ret;



More information about the samba-cvs mailing list