Changeset 232 for branches/samba-3.2.x/source/lib/util.c

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

File:

• branches/samba-3.2.x/source/lib/util.c (modified) (2 diffs)

branches/samba-3.2.x/source/lib/util.c

@@ -1041 +1041 @@
 
 bool reinit_after_fork(struct messaging_context *msg_ctx,
+                       struct event_context *ev_ctx,
                        bool parent_longlived)
 {
@@ -1057 +1058 @@
         }
 
-        /*
-         * For clustering, we need to re-init our ctdbd connection after the
-         * fork
-         */
-        status = messaging_reinit(msg_ctx);
-        if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0,("messaging_reinit() failed: %s\n",
-                         nt_errstr(status)));
-                return false;
+        if (msg_ctx) {
+                /*
+                 * For clustering, we need to re-init our ctdbd connection after the
+                 * fork
+                 */
+                status = messaging_reinit(msg_ctx);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0,("messaging_reinit() failed: %s\n",
+                                 nt_errstr(status)));
+                        return false;
+                }
+        }
+
+        if (ev_ctx) {
+                event_context_reinit(ev_ctx);
         }