Don't send message to any other child in child process.

[jra/samba/.git] / source3 / winbindd / winbindd_dual.c

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 9f91153c4a4625e98a3fbf847d3f71795ca6f3c9..9d4425b2f37b60ada5bcae6759b8664126ee50db 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1202,7 +1202,29 @@ bool winbindd_reinit_after_fork(const char *logfilename)
                }
                TALLOC_FREE(cl->lockout_policy_event);
                TALLOC_FREE(cl->machine_password_change_event);
+
+               /* Children should never be able to send 
+                * each other messages, all meesages must
+                * go through the parent.
+                */
+               cl->pid = (pid_t)0;
         }
+       /*
+        * This is a little tricky, we don't want child
+        * to send MSG_WINBIND_ONLINE to idmap_child().
+        * If we are in the child of trusted domain or
+        * in the process created by fork_child_dc_connect().
+        * And the trusted domain cannot go online,
+        * fork_child_dc_connection() sends MSG_WINBIND_ONLINE 
+        * periodically to idmap_child().
+        * look, fork_child_dc_connect() ---> getdcs() --->
+        * get_dc_name_via_netlogon() ---> cm_connect_netlogon()
+        * ---> init_dc_connection() ---> cm_open_connection --->
+        * set_domain_online(), here send MSG_WINBIND_ONLINE to
+        * idmap_child().
+        */
+       cl = idmap_child();
+       cl->pid = (pid_t)0;
 
        return true;
 }
@@ -1296,6 +1318,14 @@ static bool fork_domain_child(struct winbindd_child *child)
                        }
                }
        }
+       
+       /*
+        * We are in idmap child, make sure that we set the
+        * check_online_event to bring primary domain online.
+        */
+       if (child == idmap_child()) {
+               set_domain_online_request(primary_domain);
+       }
 
        /* We might be in the idmap child...*/
        if (child->domain && !(child->domain->internal) &&
@@ -1393,7 +1423,7 @@ static bool fork_domain_child(struct winbindd_child *child)
                        DEBUG(0,("select error occured\n"));
                        TALLOC_FREE(frame);
                        perror("select");
-                       return False;
+                       _exit(1);
                }
 
                /* fetch a request from the main daemon */
@@ -1401,7 +1431,7 @@ static bool fork_domain_child(struct winbindd_child *child)
 
                if (state.finished) {
                        /* we lost contact with our parent */
-                       exit(0);
+                       _exit(0);
                }
 
                DEBUG(4,("child daemon request %d\n", (int)state.request.cmd));