X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap.h;h=1a801a3a32390be344ed94bae26b079445f46be4;hb=975a5e9a24e971197baa9ea2d4479100977c9060;hp=a1034a14c618bdb4d4a5edd1b1035977ac457c83;hpb=25b5aaf262b108908499b6bf4cf13cc7bff41038;p=openldap

diff --git a/include/ldap.h b/include/ldap.h
index a1034a14c6..1a801a3a32 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -1188,6 +1188,7 @@ typedef LDAPRDN** LDAPDN;
 
 /* DN flags */
 #define LDAP_DN_PRETTY			0x0100U
+#define LDAP_DN_SKIP			0x0200U
 #define LDAP_DN_P_NOLEADTRAILSPACES	0x1000U
 #define LDAP_DN_P_NOSPACEAFTERRDN	0x2000U
 #define LDAP_DN_PEDANTIC		0xF000U
@@ -1205,6 +1206,12 @@ ldap_str2dn LDAP_P((
 	LDAPDN **dn,
 	unsigned flags ));
 
+LDAP_F( int )
+ldap_dn2bv LDAP_P((
+	LDAPDN *dn,
+	struct berval *bv,
+	unsigned flags ));
+
 LDAP_F( int )
 ldap_dn2str LDAP_P((
 	LDAPDN *dn,
@@ -1218,6 +1225,12 @@ ldap_str2rdn LDAP_P((
 	const char **next,
 	unsigned flags ));
 
+LDAP_F( int )
+ldap_rdn2bv LDAP_P((
+	LDAPRDN *rdn,
+	struct berval *bv,
+	unsigned flags ));
+
 LDAP_F( int )
 ldap_rdn2str LDAP_P((
 	LDAPRDN *rdn,
@@ -1271,33 +1284,33 @@ ldap_next_attribute LDAP_P((
 /*
  * in getvalues.c
  */
-LDAP_F( char ** )
-ldap_get_values LDAP_P((
-	LDAP *ld,
-	LDAPMessage *entry,
-	LDAP_CONST char *target ));
-
 LDAP_F( struct berval ** )
 ldap_get_values_len LDAP_P((
 	LDAP *ld,
 	LDAPMessage *entry,
 	LDAP_CONST char *target ));
 
-LDAP_F( int )
-ldap_count_values LDAP_P((
-	char **vals ));
-
 LDAP_F( int )
 ldap_count_values_len LDAP_P((
 	struct berval **vals ));
 
 LDAP_F( void )
-ldap_value_free LDAP_P((
+ldap_value_free_len LDAP_P((
+	struct berval **vals ));
+
+LDAP_F( char ** )
+ldap_get_values LDAP_P((	/* deprecated */
+	LDAP *ld,
+	LDAPMessage *entry,
+	LDAP_CONST char *target ));
+
+LDAP_F( int )
+ldap_count_values LDAP_P((	/* deprecated */
 	char **vals ));
 
 LDAP_F( void )
-ldap_value_free_len LDAP_P((
-	struct berval **vals ));
+ldap_value_free LDAP_P((	/* deprecated */
+	char **vals ));
 
 /*
  * in result.c:
@@ -1473,16 +1486,17 @@ ldap_mods_free LDAP_P((
 
 /*
  * in sort.c
+ *	(deprecated)
  */
-typedef int (LDAP_SORT_AD_CMP_PROC) LDAP_P((
+typedef int (LDAP_SORT_AD_CMP_PROC) LDAP_P(( /* deprecated */
 	LDAP_CONST char *left,
 	LDAP_CONST char *right ));
 
-typedef int (LDAP_SORT_AV_CMP_PROC) LDAP_P((
+typedef int (LDAP_SORT_AV_CMP_PROC) LDAP_P(( /* deprecated */
 	LDAP_CONST void *left,
 	LDAP_CONST void *right ));
 
-LDAP_F( int )
+LDAP_F( int )	/* deprecated */
 ldap_sort_entries LDAP_P(( LDAP *ld,
 	LDAPMessage **chain,
 	LDAP_CONST char *attr,
@@ -1528,27 +1542,6 @@ LDAP_F( void )
 ldap_free_urldesc LDAP_P((
 	LDAPURLDesc *ludp ));
 
-LDAP_F( int )
-ldap_url_search LDAP_P((
-	LDAP *ld,
-	LDAP_CONST char *url,
-	int attrsonly ));
-
-LDAP_F( int )
-ldap_url_search_s LDAP_P((
-	LDAP *ld,
-	LDAP_CONST char *url,
-	int attrsonly,
-	LDAPMessage **res ));
-
-LDAP_F( int )
-ldap_url_search_st LDAP_P((
-	LDAP *ld,
-	LDAP_CONST char *url,
-	int attrsonly,
-	struct timeval *timeout,
-	LDAPMessage **res ));
-
 /*
  * in sortctrl.c
  */