Import slapd nextid chunking from -devel.

[openldap] / servers / slapd / back-shell / fork.c

diff --git a/servers/slapd/back-shell/fork.c b/servers/slapd/back-shell/fork.c
index aff0e5bbe446778c06ec249e3312b0d435c077b5..2c2f9b72f889c1d44fb8628a5b82a4a894c48494 100644 (file)
--- a/servers/slapd/back-shell/fork.c
+++ b/servers/slapd/back-shell/fork.c
@@ -1,11 +1,17 @@
 /* fork.c - fork and exec a process, connecting stdin/out w/pipes */
 
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+
+#include <ac/string.h>
+#include <ac/socket.h>
+#include <ac/unistd.h>
+
 #include "slap.h"
+#include "shell.h"
 
+int
 forkandexec(
     char       **args,
     FILE       **rfp,
@@ -26,8 +32,20 @@ forkandexec(
         *      parent *rfp <- c2p[0] | c2p[1] <- stdout child
         */
 
-       switch ( (pid = fork()) ) {
+#ifdef HAVE_THR
+       switch ( (pid = fork1()) )
+#else
+       switch ( (pid = fork()) )
+#endif
+       {
        case 0:         /* child */
+               /*
+                * child could deadlock here due to resources locked
+                * by our parent
+                *
+                * If so, configure --without-threads or implement forking
+                * via a surrogate parent.
+                */
                close( p2c[1] );
                close( c2p[0] );
                if ( dup2( p2c[0], 0 ) == -1 || dup2( c2p[1], 1 ) == -1 ) {