ITS#6254

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

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 65320ef6f5905f3cab3e20ed57faab3bbec5fac5..6c5b22e1d8c7c7585a18b5b00a474cd2d544b9c8 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2008 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,9 @@
 
 #ifdef LDAP_DEBUG
 
+#define DebugTest( level ) \
+       ( ldap_debug & level )
+
 #define Debug( level, fmt, arg1, arg2, arg3 ) \
        do { if ( ldap_debug & level ) \
        ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) ); \
@@ -85,6 +88,7 @@
 
 #else
 
+#define DebugTest( level )                                    (0 == 1)
 #define Debug( level, fmt, arg1, arg2, arg3 )                 ((void)0)
 #define LDAP_Debug( subsystem, level, fmt, arg1, arg2, arg3 ) ((void)0)
 
@@ -155,9 +159,9 @@ struct ldaptls {
        char            *lt_cacertfile;
        char            *lt_cacertdir;
        char            *lt_ciphersuite;
-#ifdef HAVE_GNUTLS
        char            *lt_crlfile;
-#endif
+       char            *lt_randfile;   /* OpenSSL only */
+       int             lt_protocol_min;
 };
 #endif
 
@@ -205,9 +209,12 @@ struct ldapoptions {
 #define ldo_tls_cacertfile     ldo_tls_info.lt_cacertfile
 #define ldo_tls_cacertdir      ldo_tls_info.lt_cacertdir
 #define ldo_tls_ciphersuite    ldo_tls_info.lt_ciphersuite
+#define ldo_tls_protocol_min   ldo_tls_info.lt_protocol_min
 #define ldo_tls_crlfile        ldo_tls_info.lt_crlfile
+#define ldo_tls_randfile       ldo_tls_info.lt_randfile
        int                     ldo_tls_mode;
        int                     ldo_tls_require_cert;
+       int                     ldo_tls_impl;
 #ifdef HAVE_OPENSSL_CRL
        int                     ldo_tls_crlcheck;
 #endif
@@ -237,6 +244,14 @@ struct ldapoptions {
        unsigned ldo_gssapi_options;
 #endif
 
+       /*
+        * Per connection tcp-keepalive settings (Linux only,
+        * ignored where unsupported)
+        */
+       ber_int_t ldo_keepalive_idle;
+       ber_int_t ldo_keepalive_probes;
+       ber_int_t ldo_keepalive_interval;
+
        int             ldo_refhoplimit;        /* limit on referral nesting */
 
        /* LDAPv3 server and client controls */
@@ -599,6 +614,7 @@ LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
        LDAPControl **cctrls,
        ber_int_t timelimit,
        ber_int_t sizelimit,
+       ber_int_t deref,
        ber_int_t *msgidp));
 
 
@@ -690,6 +706,16 @@ LDAP_F (void) ldap_int_tls_destroy LDAP_P(( struct ldapoptions *lo ));
 LDAP_F (char **) ldap_value_dup LDAP_P((
        char *const *vals ));
 
+/*
+ *     in gssapi.c
+ */
+#ifdef HAVE_GSSAPI
+LDAP_F(int) ldap_int_gssapi_get_option LDAP_P(( LDAP *ld, int option, void *arg ));
+LDAP_F(int) ldap_int_gssapi_set_option LDAP_P(( LDAP *ld, int option, void *arg ));
+LDAP_F(int) ldap_int_gssapi_config LDAP_P(( struct ldapoptions *lo, int option, const char *arg ));
+LDAP_F(void) ldap_int_gssapi_close LDAP_P(( LDAP *ld, LDAPConn *lc ));
+#endif 
+
 LDAP_END_DECL
 
 #endif /* _LDAP_INT_H */