ITS#4844 add missing overlays

[openldap] / include / ldap_pvt.h

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 7463c9ea273e6b3d0c74c470a79812c5a287837b..bc9c90662c36afd6a98ffe3ad56c28df9bea9194 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * 
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,6 +27,7 @@ LDAP_BEGIN_DECL
 #define LDAP_PROTO_TCP 1 /* ldap://  */
 #define LDAP_PROTO_UDP 2 /* reserved */
 #define LDAP_PROTO_IPC 3 /* ldapi:// */
+#define LDAP_PROTO_EXT 4 /* user-defined socket/sockbuf */
 
 LDAP_F ( int )
 ldap_pvt_url_scheme2proto LDAP_P((
@@ -41,10 +42,41 @@ ldap_pvt_url_scheme_port LDAP_P((
 
 struct ldap_url_desc; /* avoid pulling in <ldap.h> */
 
+#define LDAP_PVT_URL_PARSE_NONE                        (0x00U)
+#define LDAP_PVT_URL_PARSE_NOEMPTY_HOST                (0x01U)
+#define LDAP_PVT_URL_PARSE_DEF_PORT            (0x02U)
+#define LDAP_PVT_URL_PARSE_NOEMPTY_DN          (0x04U)
+#define LDAP_PVT_URL_PARSE_NODEF_SCOPE         (0x08U)
+#define        LDAP_PVT_URL_PARSE_HISTORIC             (LDAP_PVT_URL_PARSE_NODEF_SCOPE | LDAP_PVT_URL_PARSE_NOEMPTY_HOST | LDAP_PVT_URL_PARSE_DEF_PORT)
 LDAP_F( int )
 ldap_url_parse_ext LDAP_P((
        LDAP_CONST char *url,
-       struct ldap_url_desc **ludpp ));
+       struct ldap_url_desc **ludpp,
+       unsigned flags ));
+
+LDAP_F (int) ldap_url_parselist_ext LDAP_P((
+       struct ldap_url_desc **ludlist,
+       const char *url,
+       const char *sep,
+       unsigned flags ));
+
+LDAP_F (char *) ldap_url_list2urls LDAP_P((
+       struct ldap_url_desc *ludlist ));
+
+LDAP_F (void) ldap_free_urllist LDAP_P((
+       struct ldap_url_desc *ludlist ));
+
+LDAP_F (int) ldap_pvt_scope2bv LDAP_P ((
+       int scope, struct berval *bv ));
+
+LDAP_F (LDAP_CONST char *) ldap_pvt_scope2str LDAP_P ((
+       int scope ));
+
+LDAP_F (int) ldap_pvt_bv2scope LDAP_P ((
+       struct berval *bv ));
+
+LDAP_F (int) ldap_pvt_str2scope LDAP_P ((
+       LDAP_CONST char * ));
 
 LDAP_F( char * )
 ldap_pvt_ctime LDAP_P((
@@ -193,14 +225,21 @@ LDAP_F (void) ldap_pvt_sasl_remove LDAP_P(( struct sockbuf * ));
 struct ldap;
 struct ldapmsg;
 
-LDAP_F (int) ldap_open_internal_connection LDAP_P((
-       struct ldap **ldp, ber_socket_t *fdp ));
+/* abandon */
+LDAP_F ( int ) ldap_pvt_discard LDAP_P((
+       struct ldap *ld, ber_int_t msgid ));
 
 /* messages.c */
 LDAP_F( BerElement * )
 ldap_get_message_ber LDAP_P((
        struct ldapmsg * ));
 
+/* open */
+LDAP_F (int) ldap_open_internal_connection LDAP_P((
+       struct ldap **ldp, ber_socket_t *fdp ));
+LDAP_F (int) ldap_init_fd LDAP_P((
+       ber_socket_t fd, int proto, LDAP_CONST char *url, struct ldap **ldp ));
+
 /* search.c */
 LDAP_F( int ) ldap_pvt_put_filter LDAP_P((
        BerElement *ber,