Fix attribute description checks

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

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index f682cc8736bd6cbb00246d182423b0f201e04c75..dff9730e982714963e2484092fdfc1cc3d6138df 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -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) )
@@ -397,14 +393,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 +433,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 +491,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,
+       char *str ));
 
 /*
  * in unbind.c
@@ -569,6 +570,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