prepare for ldap_bv2dn()

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

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index f682cc8736bd6cbb00246d182423b0f201e04c75..2b9df3da604843911f2099f515a15de50f210b9b 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,19 +18,17 @@
 
 #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 */
+#ifdef HAVE_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
 
 #define SASL_MAX_BUFF_SIZE     65536
 #define SASL_MIN_BUFF_SIZE     4096
@@ -61,7 +59,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 +335,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)))
@@ -397,14 +390,20 @@ LDAP_F (int) ldap_int_client_controls LDAP_P((
        LDAPControl **ctrlp ));
 
 /*
- * in kerberos.c
+ * in dsparse.c
  */
+LDAP_F (int) ldap_int_next_line_tokens LDAP_P(( char **bufp, ber_len_t *blenp, char ***toksp ));
+
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+/*
+ * in kerberos.c
+ */
 LDAP_F (char *) ldap_get_kerberosv4_credentials LDAP_P((
        LDAP *ld,
        LDAP_CONST char *who,
        LDAP_CONST char *service,
        ber_len_t *len ));
+
 #endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 
 
@@ -431,7 +430,7 @@ LDAP_F (char *) ldap_host_connected_to( Sockbuf *sb );
 #endif
 
 LDAP_F (void) ldap_int_ip_init( void );
-LDAP_F (int) do_ldap_select( LDAP *ld, struct timeval *timeout );
+LDAP_F (int) ldap_int_select( LDAP *ld, struct timeval *timeout );
 LDAP_F (void *) ldap_new_select_info( void );
 LDAP_F (void) ldap_free_select_info( void *sip );
 LDAP_F (void) ldap_mark_select_write( LDAP *ld, Sockbuf *sb );
@@ -489,10 +488,9 @@ LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
        ber_int_t timelimit,
        ber_int_t sizelimit ));
 
-/*
- * in string.c
- */
-       /* see <ac/string.h> */
+LDAP_F( int ) ldap_int_put_filter LDAP_P((
+       BerElement *ber,
+       const char *str ));
 
 /*
  * in unbind.c
@@ -569,6 +567,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