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

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 );

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 );

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 );

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 );

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 );

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 );

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 );

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;
 	}