X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Fbind.c;h=e59cca3a1bd6c8890ebd4c359e3a5991fbd9d3ae;hb=1dff9049f9b4788883e9b3820763483d01875fb3;hp=0acca761ce517394b3ad9b655d8a3c311c03129f;hpb=e8c58b4e7f21caa6c0b6006e3528cbad9b8aed45;p=openldap

diff --git a/servers/slapd/back-shell/bind.c b/servers/slapd/back-shell/bind.c
index 0acca761ce..e59cca3a1b 100644
--- a/servers/slapd/back-shell/bind.c
+++ b/servers/slapd/back-shell/bind.c
@@ -1,8 +1,31 @@
 /* bind.c - shell backend bind 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-2005 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"
@@ -48,8 +71,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 );