Fix explicit backend dependencies. Wildcard was unreliable.

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

diff --git a/servers/slapd/back-shell/fork.c b/servers/slapd/back-shell/fork.c
index 14eaca43490680b602ac2e461b4abe24dfe33e5f..1f08097b1a41aaed8604eb7849782d61c0a5dfad 100644 (file)
--- a/servers/slapd/back-shell/fork.c
+++ b/servers/slapd/back-shell/fork.c
@@ -6,9 +6,12 @@
 
 #include <ac/string.h>
 #include <ac/socket.h>
+#include <ac/unistd.h>
 
 #include "slap.h"
+#include "shell.h"
 
+pid_t
 forkandexec(
     char       **args,
     FILE       **rfp,
@@ -16,7 +19,7 @@ forkandexec(
 )
 {
        int     p2c[2], c2p[2];
-       int     pid;
+       pid_t   pid;
 
        if ( pipe( p2c ) != 0 || pipe( c2p ) != 0 ) {
                Debug( LDAP_DEBUG_ANY, "pipe failed\n", 0, 0, 0 );
@@ -29,19 +32,31 @@ 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 ) {
                        Debug( LDAP_DEBUG_ANY, "dup2 failed\n", 0, 0, 0 );
-                       exit( -1 );
+                       exit( EXIT_FAILURE );
                }
 
                execv( args[0], args );
 
                Debug( LDAP_DEBUG_ANY, "execv failed\n", 0, 0, 0 );
-               exit( -1 );
+               exit( EXIT_FAILURE );
 
        case -1:        /* trouble */
                Debug( LDAP_DEBUG_ANY, "fork failed\n", 0, 0, 0 );