summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-01-30 16:51:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:30 -0500
commitc51e4c3440dc9189f3532ecf69f5b08920b285bb (patch)
treece341d49887cbc0071498682987801c3bed2b852
parente90b6c743deeb8db2e7c779f5427d8b45ee77aef (diff)
downloadsamba-c51e4c3440dc9189f3532ecf69f5b08920b285bb.tar.gz
samba-c51e4c3440dc9189f3532ecf69f5b08920b285bb.tar.bz2
samba-c51e4c3440dc9189f3532ecf69f5b08920b285bb.zip
r21056: 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 (This used to be commit beed8b8b320ae9bd8aef669564a5403e4bb35bfd)
-rw-r--r--source3/nsswitch/winbindd_dual.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 62193c0b69..22786df601 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -842,15 +842,6 @@ static BOOL fork_domain_child(struct winbindd_child *child)
/* 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 @@ static BOOL fork_domain_child(struct winbindd_child *child)
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;