Sync with HEAD

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

diff --git a/servers/slapd/back-shell/search.c b/servers/slapd/back-shell/search.c
index a80d9502cf69e55fdc32ef9c49c5ee6a91871953..1b988b0835298428200a9b5c05f11c505d33876e 100644 (file)
--- a/servers/slapd/back-shell/search.c
+++ b/servers/slapd/back-shell/search.c
@@ -1,8 +1,31 @@
 /* search.c - shell backend search function */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
  */
 
 #include "portable.h"
@@ -30,8 +53,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 );