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

diff --git a/servers/slurpd/proto-slurp.h b/servers/slurpd/proto-slurp.h
index 56e3282902..b21386737c 100644
--- a/servers/slurpd/proto-slurp.h
+++ b/servers/slurpd/proto-slurp.h
@@ -1,3 +1,32 @@
+/* $OpenLDAP$ */
+/* 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
 
@@ -12,20 +41,33 @@ RETSIGTYPE do_admin	LDAP_P((int sig));
 int doargs	LDAP_P((int argc, char **argv, struct globals *g));
 
 /* ch_malloc.c */
-void *ch_malloc	LDAP_P((unsigned long size));
-void *ch_realloc	LDAP_P((void *block, unsigned long size));
-void *ch_calloc	LDAP_P((unsigned long nelem, unsigned long size));
+#ifdef CSRIMALLOC
+#define ch_malloc malloc
+#define ch_realloc realloc
+#define ch_calloc calloc
+#define ch_strdup strdup
+#define ch_free free
+#else
+void *ch_malloc	LDAP_P((ber_len_t size));
+void *ch_realloc	LDAP_P((void *block, ber_len_t size));
+void *ch_calloc	LDAP_P((ber_len_t nelem, ber_len_t size));
+char *ch_strdup LDAP_P((const char *str));
 void ch_free	LDAP_P((void *p));
+#endif
 
 /* config.c */
 int slurpd_read_config	LDAP_P((char *fname));
 
+extern char *slurpd_pid_file;
+extern char *slurpd_args_file;
+
 /* ch_malloc.c */
 void ch_free LDAP_P(( void *p ));
 
 /* fm.c */
 void *fm	LDAP_P((void *arg));
 RETSIGTYPE do_nothing	LDAP_P((int i));
+RETSIGTYPE slurp_set_shutdown LDAP_P((int));
 
 /* globals.c */
 extern struct globals *sglob;
@@ -35,13 +77,13 @@ 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((char *fname, char *type, FILE **lfp));
+FILE *lock_fopen	LDAP_P((const char *fname, const char *type, FILE **lfp));
 int lock_fclose	LDAP_P((FILE *fp, FILE *lfp));
-int acquire_lock	LDAP_P((char *file, FILE **rfp, FILE **lfp));
-int relinquish_lock	LDAP_P((char *file, FILE *rfp, FILE *lfp));
+int acquire_lock	LDAP_P((const char *file, FILE **rfp, FILE **lfp));
+int relinquish_lock	LDAP_P((const char *file, FILE *rfp, FILE *lfp));
 
 /* reject.c */
 void write_reject	LDAP_P((Ri *ri, Re *re, int lderr, char *errmsg));
@@ -65,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 */