Do not set op->o_private (to the process' pid). Only abandon needed it.

diff --git a/servers/slapd/back-shell/add.c b/servers/slapd/back-shell/add.c
index 31c83e487b4787a9e6c72b81fe650197bdc97c09..368404ebf3bb0048c2461d9460b5baeb95211a1c 100644 (file)
--- a/servers/slapd/back-shell/add.c
+++ b/servers/slapd/back-shell/add.c
@@ -38,7 +38,7 @@ shell_back_add(
                return -1;
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_add, &rfp, &wfp )) == (void *) -1 ) {
+       if ( forkandexec( si->si_add, &rfp, &wfp ) == (pid_t)-1 ) {
                send_ldap_error( op, rs, LDAP_OTHER,
                    "could not fork/exec" );
                return( -1 );

diff --git a/servers/slapd/back-shell/bind.c b/servers/slapd/back-shell/bind.c
index 0acca761ce517394b3ad9b655d8a3c311c03129f..d777394c691c3fa7b06c370ecb183ba52c76a3e5 100644 (file)
--- a/servers/slapd/back-shell/bind.c
+++ b/servers/slapd/back-shell/bind.c
@@ -48,8 +48,7 @@ shell_back_bind(
                return -1;
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_bind, &rfp, &wfp ))
-           == (void *) -1 ) {
+       if ( forkandexec( si->si_bind, &rfp, &wfp ) == (pid_t)-1 ) {
                send_ldap_error( op, rs, LDAP_OTHER,
                    "could not fork/exec" );
                return( -1 );

diff --git a/servers/slapd/back-shell/compare.c b/servers/slapd/back-shell/compare.c
index 09ffb4d4aa937c0b3c17ba518158d47c74873c2d..1a840ef2967cac0f356dfb1930a4112012998300 100644 (file)
--- a/servers/slapd/back-shell/compare.c
+++ b/servers/slapd/back-shell/compare.c
@@ -47,8 +47,7 @@ shell_back_compare(
                return -1;
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_compare, &rfp, &wfp ))
-           == (void *) -1 ) {
+       if ( forkandexec( si->si_compare, &rfp, &wfp ) == (pid_t)-1 ) {
                send_ldap_error( op, rs, LDAP_OTHER,
                    "could not fork/exec" );
                return( -1 );

diff --git a/servers/slapd/back-shell/delete.c b/servers/slapd/back-shell/delete.c
index 3daec4c898cd09201a4e6663bd336b3253b5a271..d33ef122201c19e000c54e72d6fe872d757e635f 100644 (file)
--- a/servers/slapd/back-shell/delete.c
+++ b/servers/slapd/back-shell/delete.c
@@ -47,8 +47,7 @@ shell_back_delete(
                return -1;
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_delete, &rfp, &wfp ))
-           == (void *) -1 ) {
+       if ( forkandexec( si->si_delete, &rfp, &wfp ) == (pid_t)-1 ) {
                send_ldap_error( op, rs, LDAP_OTHER,
                    "could not fork/exec" );
                return( -1 );

diff --git a/servers/slapd/back-shell/modify.c b/servers/slapd/back-shell/modify.c
index 248a64dc45d8602728c821d1b78558b5f2c1e2a5..906ee6093c8ab819339c172bd480383587ddd3f0 100644 (file)
--- a/servers/slapd/back-shell/modify.c
+++ b/servers/slapd/back-shell/modify.c
@@ -50,8 +50,7 @@ shell_back_modify(
                return -1;
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_modify, &rfp, &wfp ))
-           == (void *) -1 ) {
+       if ( forkandexec( si->si_modify, &rfp, &wfp ) == (pid_t)-1 ) {
                send_ldap_error( op, rs, LDAP_OTHER,
                    "could not fork/exec" );
                return( -1 );

diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index f24831e3ac79e3bba7cc6ebe8d19e6b7a343ccf1..ddffb9149318afca99636e4e3227933144117cb4 100644 (file)
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -60,8 +60,7 @@ shell_back_modrdn(
                return -1;
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_modrdn, &rfp, &wfp ))
-           == (void *) -1 ) {
+       if ( forkandexec( si->si_modrdn, &rfp, &wfp ) == (pid_t)-1 ) {
                send_ldap_error( op, rs, LDAP_OTHER,
                    "could not fork/exec" );
                return( -1 );

diff --git a/servers/slapd/back-shell/search.c b/servers/slapd/back-shell/search.c
index a80d9502cf69e55fdc32ef9c49c5ee6a91871953..13c073090f4a1294791978151d8555d5f6090765 100644 (file)
--- a/servers/slapd/back-shell/search.c
+++ b/servers/slapd/back-shell/search.c
@@ -30,8 +30,7 @@ shell_back_search(
                return( -1 );
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_search, &rfp, &wfp ))
-           == (void *) -1 ) {
+       if ( forkandexec( si->si_search, &rfp, &wfp ) == (pid_t)-1 ) {
                send_ldap_error( op, rs, LDAP_OTHER,
                    "could not fork/exec" );
                return( -1 );

diff --git a/servers/slapd/back-shell/unbind.c b/servers/slapd/back-shell/unbind.c
index 221b0f83a392fb42d97df6093ee090b23665d838..005b8640f0f3b3f25971254ea5a6810d651b2467 100644 (file)
--- a/servers/slapd/back-shell/unbind.c
+++ b/servers/slapd/back-shell/unbind.c
@@ -28,8 +28,7 @@ shell_back_unbind(
                return 0;
        }
 
-       if ( (op->o_private = (void *) forkandexec( si->si_unbind, &rfp, &wfp ))
-           == (void *) -1 ) {
+       if ( forkandexec( si->si_unbind, &rfp, &wfp ) == (pid_t)-1 ) {
                return 0;
        }