revert previous commit: do accept '\00'

[openldap] / libraries / libldap / ldap-int.h

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index d042c1b29265bdbe10027b6c7bd491dcfcfead26..591c3e4e74cebf992273719649df51dd4b69dea1 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -1,7 +1,7 @@
 /*  ldap-int.h - defines & prototypes internal to the LDAP library */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -18,16 +18,10 @@
 
 #include "../liblber/lber-int.h"
 
-/*
- * Windows does not preprocess correctly unless
- * this #include precedes queue.h
- */
 #ifdef LDAP_R_COMPILE
 #include <ldap_pvt_thread.h>
 #endif
 
-#include <ac/queue.h>
-
 #ifdef HAVE_CYRUS_SASL
        /* the need for this should be removed */
 #include <sasl.h>
@@ -61,7 +55,9 @@
 
 #undef Debug
 #define Debug( level, fmt, arg1, arg2, arg3 ) \
-       ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) )
+       do { if ( ldap_debug & level ) \
+       ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) ); \
+       } while ( 0 )
 
 #define LDAP_Debug( subsystem, level, fmt, arg1, arg2, arg3 )\
        ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) )
@@ -335,13 +331,6 @@ LDAP_F ( void ) ldap_int_initialize_global_options LDAP_P((
 
 /* memory.c */
        /* simple macros to realloc for now */
-#define LDAP_INT_MALLOC(s)             (LBER_MALLOC((s)))
-#define LDAP_INT_CALLOC(n,s)   (LBER_CALLOC((n),(s)))
-#define LDAP_INT_REALLOC(p,s)  (LBER_REALLOC((p),(s)))
-#define LDAP_INT_FREE(p)               (LBER_FREE((p)))
-#define LDAP_INT_VFREE(v)              (LBER_VFREE((void **)(v)))
-#define LDAP_INT_STRDUP(s)             (LBER_STRDUP((s)))
-
 #define LDAP_MALLOC(s)         (LBER_MALLOC((s)))
 #define LDAP_CALLOC(n,s)       (LBER_CALLOC((n),(s)))
 #define LDAP_REALLOC(p,s)      (LBER_REALLOC((p),(s)))
@@ -497,7 +486,7 @@ LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
 
 LDAP_F( int ) ldap_int_put_filter LDAP_P((
        BerElement *ber,
-       char *str ));
+       const char *str ));
 
 /*
  * in unbind.c
@@ -574,6 +563,11 @@ LDAP_F (int) ldap_int_sasl_bind LDAP_P((
        LDAP_SASL_INTERACT_PROC *interact,
        void *defaults ));
 
+/* in schema.c */
+LDAP_F (char *) ldap_int_parse_numericoid LDAP_P((
+       const char **sp,
+       int *code,
+       const int flags ));
 
 /*
  * in tls.c