Minor bug fix in ldap_parse_extended_result.

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

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 6b1ca1a027eca2663cc97c0e3fb4b78251d82019..2957420a9a2107875abae025699099866a8d1f6d 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -90,6 +91,9 @@ struct ldapoptions {
 #define LDAP_VALID_SESSION     0x2
 
        int             ldo_debug;
+       /* per API call timeout */
+       struct timeval          *ldo_tm_api;
+       struct timeval          *ldo_tm_net;
 
        ber_int_t               ldo_version;    /* version to connect at */
        ber_int_t               ldo_deref;
@@ -119,6 +123,7 @@ struct ldapoptions {
        LDAP_BOOLEANS ldo_booleans;     /* boolean options */
 };
 
+
 /*
  * structure for tracking LDAP server host, ports, DNs, etc.
  */
@@ -266,7 +271,7 @@ struct ldap {
  * in init.c
  */
 
-extern struct ldapoptions ldap_int_global_options;
+LDAP_F ( struct ldapoptions ) ldap_int_global_options;
 void ldap_int_initialize LDAP_P((void));
 
 
@@ -295,7 +300,8 @@ void ldap_int_utils_init LDAP_P(( void ));
 /*
  * in print.c
  */
-int ldap_log_printf LDAP_P((LDAP *ld, int level, const char *fmt, ...));
+int ldap_log_printf LDAP_P((LDAP *ld, int level, const char *fmt, ...))
+                    LDAP_GCCATTR((format(printf, 3, 4)));
 
 /*
  * in cache.c
@@ -345,6 +351,7 @@ char *ldap_get_kerberosv4_credentials LDAP_P((
 /*
  * in open.c
  */
+int ldap_open_defconn( LDAP *ld );
 int open_ldap_connection( LDAP *ld, Sockbuf *sb, const char *host, int defport,
        char **krbinstancep, int async );
 
@@ -353,9 +360,10 @@ int open_ldap_connection( LDAP *ld, Sockbuf *sb, const char *host, int defport,
  * in os-ip.c
  */
 extern int ldap_int_tblsize;
+int ldap_int_timeval_dup( struct timeval **dest, const struct timeval *tm );
+int ldap_connect_to_host( LDAP *ld, Sockbuf *sb, const char *host,
+       unsigned long address, int port, int async );
 
-int ldap_connect_to_host( Sockbuf *sb, const char *host, unsigned long address, int port,
-       int async );
 void ldap_close_connection( Sockbuf *sb );
 
 #ifdef HAVE_KERBEROS