X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslurpd%2Fproto-slurp.h;h=b21386737c09f2744922cb774e24c12324724ab9;hb=59d4b38a7c9247d13bbff43c73c253929e348fdf;hp=d91ba666569c725f0d2892b077ba9c0caba9b794;hpb=54d01d8946ec386b9431161894fbcfd47cfa435a;p=openldap

diff --git a/servers/slurpd/proto-slurp.h b/servers/slurpd/proto-slurp.h
index d91ba66656..b21386737c 100644
--- a/servers/slurpd/proto-slurp.h
+++ b/servers/slurpd/proto-slurp.h
@@ -1,8 +1,32 @@
 /* $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-2007 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+/* Portions Copyright (c) 1996 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).
+ */
+
 #ifndef _PROTO_SLURP
 #define _PROTO_SLURP
 
@@ -53,7 +77,7 @@ extern int ldap_debug;
 extern struct globals *init_globals	LDAP_P((void));
 
 /* ldap_op.c */
-int do_ldap	LDAP_P((Ri *ri, Re *re, char **errmsg));
+int do_ldap	LDAP_P((Ri *ri, Re *re, char **errmsg, int *errfree));
 
 /* lock.c */
 FILE *lock_fopen	LDAP_P((const char *fname, const char *type, FILE **lfp));
@@ -83,4 +107,7 @@ int tsleep	LDAP_P((time_t interval));
 void start_lwp_scheduler LDAP_P(( void ));
 #endif
 
+/*main.c */
+extern const char Versionstr[];
+
 #endif /* _PROTO_SLURP */