svn commit: samba r18937 - in branches/SAMBA_3_0/source/nsswitch: .

[jerry]

Author: jerry
Date: 2006-09-27 02:26:03 +0000 (Wed, 27 Sep 2006)
New Revision: 18937

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

Log:
Protect against segc in the idmap winbindd child process
(the domain is NULL here)


Modified:
   branches/SAMBA_3_0/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  2006-09-27 02:00:13 UTC 
(rev 18936)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c  2006-09-27 02:26:03 UTC 
(rev 18937)
@@ -766,7 +766,9 @@
        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 @@
 
                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 ));