Add CSRIMALLOC Support

diff --git a/servers/slurpd/ch_malloc.c b/servers/slurpd/ch_malloc.c
index 54d54c3aaa750d6574bccc5c60d121153facb0f2..41bad34005f06ce4d5ab05a8151373d690f85e66 100644 (file)
--- a/servers/slurpd/ch_malloc.c
+++ b/servers/slurpd/ch_malloc.c
@@ -10,6 +10,8 @@
  * is provided ``as is'' without express or implied warranty.
  */
 
+#define CH_FREE 1
+
 /*
  * ch_malloc.c - malloc() and friends, with check for NULL return.
  */
@@ -24,6 +26,7 @@
 #include "../slapd/slap.h"
 
 
+#ifndef CSRIMALLOC
 
 /*
  * Just like malloc, except we check the returned value and exit
@@ -116,3 +119,4 @@ ch_free(
     return;
 }
 
+#endif

diff --git a/servers/slurpd/proto-slurp.h b/servers/slurpd/proto-slurp.h
index 37bcb3f85d9e50795700456b897a64c1902877c0..2d314cdd3a0588c87eece32bfdddf74198d219c2 100644 (file)
--- a/servers/slurpd/proto-slurp.h
+++ b/servers/slurpd/proto-slurp.h
@@ -12,10 +12,17 @@ RETSIGTYPE do_admin LDAP_P((int sig));
 int doargs     LDAP_P((int argc, char **argv, struct globals *g));
 
 /* ch_malloc.c */
+#ifdef CSRIMALLOC
+#define ch_malloc malloc
+#define ch_realloc realloc
+#define ch_calloc calloc
+#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));
 void ch_free   LDAP_P((void *p));
+#endif
 
 /* config.c */
 int slurpd_read_config LDAP_P((char *fname));