Plug leaks (ITS#1116)

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

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index d265957e73062a1e9624b2e159fc39cb06315b94..33ba74d2cb0907786451201a95ab92de6ec8cf91 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -68,6 +68,10 @@ LDAP_BEGIN_DECL
 #define LDAPS_URL_PREFIX_LEN   (sizeof(LDAPS_URL_PREFIX)-1)
 #define LDAPI_URL_PREFIX       "ldapi://"
 #define LDAPI_URL_PREFIX_LEN   (sizeof(LDAPI_URL_PREFIX)-1)
+#ifdef LDAP_CONNECTIONLESS
+#define LDAPC_URL_PREFIX       "cldap://"
+#define LDAPC_URL_PREFIX_LEN   (sizeof(LDAPC_URL_PREFIX)-1)
+#endif
 #define LDAP_URL_URLCOLON              "URL:"
 #define LDAP_URL_URLCOLON_LEN  (sizeof(LDAP_URL_URLCOLON)-1)
 
@@ -114,6 +118,12 @@ struct ldapoptions {
 #define LDAP_UNINITIALIZED     0x0
 #define LDAP_INITIALIZED       0x1
 #define LDAP_VALID_SESSION     0x2
+#ifdef LDAP_CONNECTIONLESS
+#define        LDAP_IS_UDP(ld)         ((ld)->ld_options.ldo_is_udp)
+       void*                   ldo_peer;       /* struct sockaddr* */
+       char*                   ldo_cldapdn;
+       int                     ldo_is_udp;
+#endif
 
        int             ldo_debug;
        /* per API call timeout */
@@ -209,6 +219,7 @@ typedef struct ldapreq {
        BerElement      *lr_ber;        /* ber encoded request contents */
        LDAPConn        *lr_conn;       /* connection used to send request */
        struct ldapreq  *lr_parent;     /* request that spawned this referral */
+       struct ldapreq  *lr_child;      /* first child request */
        struct ldapreq  *lr_refnext;    /* next referral spawned */
        struct ldapreq  *lr_prev;       /* previous request */
        struct ldapreq  *lr_next;       /* next request */
@@ -329,6 +340,12 @@ LDAP_F ( void ) ldap_int_initialize_global_options LDAP_P((
 #define LDAP_FREE(p)           (LBER_FREE((p)))
 #define LDAP_VFREE(v)          (LBER_VFREE((void **)(v)))
 #define LDAP_STRDUP(s)         (LBER_STRDUP((s)))
+#define LDAP_STRNDUP(s,l)      (LBER_STRNDUP((s),(l)))
+
+/*
+ * in error.c
+ */
+void ldap_int_error_init( void );
 
 /*
  * in unit-int.c
@@ -367,6 +384,9 @@ LDAP_F (int) ldap_int_put_controls LDAP_P((
        LDAPControl *const *ctrls,
        BerElement *ber ));
 
+LDAP_F (int) ldap_int_client_controls LDAP_P((
+       LDAP *ld,
+       LDAPControl **ctrlp ));
 
 /*
  * in dsparse.c
@@ -526,7 +546,8 @@ LDAP_F (int) ldap_int_sasl_open LDAP_P((
 LDAP_F (int) ldap_int_sasl_close LDAP_P(( LDAP *ld, LDAPConn *conn ));
 
 LDAP_F (int) ldap_int_sasl_external LDAP_P((
-       LDAP *ld, const char* authid, ber_len_t ssf ));
+       LDAP *ld, LDAPConn *conn,
+       const char* authid, ber_len_t ssf ));
 
 LDAP_F (int) ldap_int_sasl_get_option LDAP_P(( LDAP *ld,
        int option, void *arg ));
@@ -553,6 +574,9 @@ LDAP_F (int) ldap_int_sasl_bind LDAP_P((
 LDAP_F (int) ldap_int_tls_config LDAP_P(( LDAP *ld,
        int option, const char *arg ));
 
+LDAP_F (int) ldap_int_tls_start LDAP_P(( LDAP *ld,
+       LDAPConn *conn, LDAPURLDesc *srv ));
+
 LDAP_END_DECL
 
 #endif /* _LDAP_INT_H */