From 6a492e712243fe2bf58d5d5f493630ae937d85df Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 27 Sep 2006 02:26:03 +0000 Subject: r18937: Protect against segc in the idmap winbindd child process (the domain is NULL here) (This used to be commit a36de910d289363a5374fe063099311712d4e57a) --- source3/nsswitch/winbindd_dual.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source3/nsswitch/winbindd_dual.c') diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c index 1a3de3f1e5..317a103f33 100644 --- a/source3/nsswitch/winbindd_dual.c +++ b/source3/nsswitch/winbindd_dual.c @@ -766,7 +766,9 @@ static BOOL fork_domain_child(struct winbindd_child *child) message_register(MSG_WINBIND_ONLINE,child_msg_online); message_register(MSG_WINBIND_ONLINESTATUS,child_msg_onlinestatus); - child->domain->startup = True; + if ( child->domain ) { + child->domain->startup = True; + } startup_time = time(NULL); while (1) { @@ -785,7 +787,7 @@ static BOOL fork_domain_child(struct winbindd_child *child) GetTimeOfDay(&now); - if (child->domain->startup && (now.tv_sec > startup_time + 30)) { + if (child->domain && child->domain->startup && (now.tv_sec > startup_time + 30)) { /* No longer in "startup" mode. */ DEBUG(10,("fork_domain_child: domain %s no longer in 'startup' mode.\n", child->domain->name )); -- cgit