Misc DESC updates

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index 3ed2378b3b7977f5c4a47752d88992cfb23b804f..0bf6d0ae14bc887448c31af4e19ecc556d45eb17 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -120,7 +120,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_X_TLS_CERTFILE                0x6004
 #define LDAP_OPT_X_TLS_KEYFILE         0x6005
 #define LDAP_OPT_X_TLS_REQUIRE_CERT    0x6006
-#define LDAP_OPT_X_TLS_PROTOCOL                0x6007
+/* #define LDAP_OPT_X_TLS_PROTOCOL             0x6007 */
 #define LDAP_OPT_X_TLS_CIPHER_SUITE    0x6008
 #define LDAP_OPT_X_TLS_RANDOM_FILE     0x6009
 
@@ -295,7 +295,7 @@ typedef struct ldapcontrol {
 /* authentication methods available */
 #define LDAP_AUTH_NONE         ((ber_tag_t) 0x00U)     /* no authentication              */
 #define LDAP_AUTH_SIMPLE       ((ber_tag_t) 0x80U)     /* context specific + primitive   */
-#define LDAP_AUTH_SASL         ((ber_tag_t) 0xa3U)     /* context specific + primitive   */
+#define LDAP_AUTH_SASL         ((ber_tag_t) 0xa3U)     /* context specific + constructed */
 #define LDAP_AUTH_KRBV4                ((ber_tag_t) 0xffU)     /* means do both of the following */
 #define LDAP_AUTH_KRBV41       ((ber_tag_t) 0x81U)     /* context specific + primitive   */
 #define LDAP_AUTH_KRBV42       ((ber_tag_t) 0x82U)     /* context specific + primitive   */
@@ -936,7 +936,7 @@ ldap_parse_result LDAP_P((
        LDAPControl             ***serverctrls,
        int                             freeit ));
 
-LDAP_F( char *)
+LDAP_F( char * )
 ldap_err2string LDAP_P((
        int err ));
 
@@ -1055,12 +1055,12 @@ ldap_modrdn2_s LDAP_P(( /* deprecated */
 /*
  * in open.c:
  */
-LDAP_F( LDAP *)
+LDAP_F( LDAP * )
 ldap_init LDAP_P((
        LDAP_CONST char *host,
        int port ));
 
-LDAP_F( LDAP *)
+LDAP_F( LDAP * )
 ldap_open LDAP_P((     /* deprecated */
        LDAP_CONST char *host,
        int port ));
@@ -1083,12 +1083,12 @@ ldap_start_tls_s LDAP_P((
 /*
  * in messages.c:
  */
-LDAP_F( LDAPMessage *)
+LDAP_F( LDAPMessage * )
 ldap_first_message LDAP_P((
        LDAP *ld,
        LDAPMessage *chain ));
 
-LDAP_F( LDAPMessage *)
+LDAP_F( LDAPMessage * )
 ldap_next_message LDAP_P((
        LDAP *ld,
        LDAPMessage *msg ));
@@ -1102,12 +1102,12 @@ ldap_count_messages LDAP_P((
 /*
  * in references.c:
  */
-LDAP_F( LDAPMessage *)
+LDAP_F( LDAPMessage * )
 ldap_first_reference LDAP_P((
        LDAP *ld,
        LDAPMessage *chain ));
 
-LDAP_F( LDAPMessage *)
+LDAP_F( LDAPMessage * )
 ldap_next_reference LDAP_P((
        LDAP *ld,
        LDAPMessage *ref ));
@@ -1129,12 +1129,12 @@ ldap_parse_reference LDAP_P((
 /*
  * in getentry.c:
  */
-LDAP_F( LDAPMessage *)
+LDAP_F( LDAPMessage * )
 ldap_first_entry LDAP_P((
        LDAP *ld,
        LDAPMessage *chain ));
 
-LDAP_F( LDAPMessage *)
+LDAP_F( LDAPMessage * )
 ldap_next_entry LDAP_P((
        LDAP *ld,
        LDAPMessage *entry ));
@@ -1154,7 +1154,7 @@ ldap_get_entry_controls LDAP_P((
 /*
  * in addentry.c
  */
-LDAP_F( LDAPMessage *)
+LDAP_F( LDAPMessage * )
 ldap_delete_result_entry LDAP_P((
        LDAPMessage **list,
        LDAPMessage *e ));
@@ -1173,17 +1173,78 @@ ldap_get_dn LDAP_P((
        LDAP *ld,
        LDAPMessage *entry ));
 
+typedef struct ldap_ava {
+       struct berval *la_attr;
+       struct berval *la_value;
+       unsigned la_flags;
+#define LDAP_AVA_STRING                0x0000U
+#define LDAP_AVA_BINARY                0x0001U
+#define LDAP_AVA_NONPRINTABLE  0x0002U
+} LDAPAVA;
+
+typedef LDAPAVA** LDAPRDN;
+typedef LDAPRDN** LDAPDN;
+
+/* DN formats */
+#define LDAP_DN_FORMAT_LDAPV3  0x0000U
+#define LDAP_DN_FORMAT_LDAPV2  0x0001U
+#define LDAP_DN_FORMAT_DCE             0x0002U
+#define LDAP_DN_FORMAT_UFN             0x0003U /* dn2str only */
+#define LDAP_DN_FORMAT_AD_CANONICAL    0x0004U /* dn2str only */
+#define LDAP_DN_FORMAT_MASK            0x000FU
+
+/* str2dn flags */
+#define LDAP_DN_P_NOLEADTRAILSPACES    0x1000U
+#define LDAP_DN_P_NOSPACEAFTERRDN      0x2000U
+#define LDAP_DN_PEDANTIC               0xF000U
+
+LDAP_F( int )
+ldap_str2dn LDAP_P((
+       LDAP_CONST char *str,
+       LDAPDN **dn,
+       unsigned flags ));
+
+LDAP_F( int )
+ldap_dn2str LDAP_P((
+       LDAPDN *dn,
+       char **str,
+       unsigned flags ));
+
+LDAP_F( void )
+ldapava_free_dn LDAP_P(( LDAPDN *dn ));
+
+LDAP_F( int )
+ldap_str2rdn LDAP_P(( 
+       const char *str, 
+       LDAPRDN **rdn, 
+       const char **next,
+       unsigned flags ));
+
+LDAP_F( int )
+ldap_rdn2str LDAP_P(( 
+       LDAPRDN *rdn, 
+       char **str, 
+       unsigned flags ));
+
+LDAP_F( void )
+ldapava_free_rdn LDAP_P(( LDAPRDN *rdn ));
+
+LDAP_F( int )
+ldap_dn_normalize LDAP_P((
+       LDAP_CONST char *in, unsigned iflags,
+       char **out, unsigned oflags ));
+
 LDAP_F( char * )
-ldap_dn2ufn LDAP_P((
+ldap_dn2ufn LDAP_P(( /* deprecated */
        LDAP_CONST char *dn ));
 
 LDAP_F( char ** )
-ldap_explode_dn LDAP_P((
+ldap_explode_dn LDAP_P(( /* deprecated */
        LDAP_CONST char *dn,
        int notypes ));
 
 LDAP_F( char ** )
-ldap_explode_rdn LDAP_P((
+ldap_explode_rdn LDAP_P(( /* deprecated */
        LDAP_CONST char *rdn,
        int notypes ));
 
@@ -1193,16 +1254,19 @@ ldap_dn2dcedn LDAP_P(( LDAP_CONST char *dn ));  /* deprecated */
 LDAP_F( char * )
 ldap_dcedn2dn LDAP_P(( LDAP_CONST char *dce ));        /* deprecated */
 
+LDAP_F( char * )
+ldap_dn2ad_canonical LDAP_P(( LDAP_CONST char *dn ));  /* deprecated */
+
 /*
  * in getattr.c
  */
-LDAP_F( char *)
+LDAP_F( char * )
 ldap_first_attribute LDAP_P((                                                                   
        LDAP *ld,
        LDAPMessage *entry,
        BerElement **ber ));
 
-LDAP_F( char *)
+LDAP_F( char * )
 ldap_next_attribute LDAP_P((
        LDAP *ld,
        LDAPMessage *entry,
@@ -1212,13 +1276,13 @@ ldap_next_attribute LDAP_P((
 /*
  * in getvalues.c
  */
-LDAP_F( char **)
+LDAP_F( char ** )
 ldap_get_values LDAP_P((
        LDAP *ld,
        LDAPMessage *entry,
        LDAP_CONST char *target ));
 
-LDAP_F( struct berval **)
+LDAP_F( struct berval ** )
 ldap_get_values_len LDAP_P((
        LDAP *ld,
        LDAPMessage *entry,
@@ -1357,22 +1421,22 @@ ldap_unbind_ext_s LDAP_P((
  * in getfilter.c
  *     (deprecated)
  */
-LDAP_F( LDAPFiltDesc *)
+LDAP_F( LDAPFiltDesc * )
 ldap_init_getfilter LDAP_P(( /* deprecated */
        LDAP_CONST char *fname ));
 
-LDAP_F( LDAPFiltDesc *)
+LDAP_F( LDAPFiltDesc * )
 ldap_init_getfilter_buf LDAP_P(( /* deprecated */
        /* LDAP_CONST */ char *buf,
        ber_len_t buflen ));
 
-LDAP_F( LDAPFiltInfo *)
+LDAP_F( LDAPFiltInfo * )
 ldap_getfirstfilter LDAP_P(( /* deprecated */
        LDAPFiltDesc *lfdp,
        /* LDAP_CONST */ char *tagpat,
        /* LDAP_CONST */ char *value ));
 
-LDAP_F( LDAPFiltInfo *)
+LDAP_F( LDAPFiltInfo * )
 ldap_getnextfilter LDAP_P(( /* deprecated */
        LDAPFiltDesc *lfdp ));
 
@@ -1441,7 +1505,7 @@ ldap_mods_free LDAP_P((
 LDAP_F( char * )
 ldap_friendly_name LDAP_P(( /* deprecated */
        LDAP_CONST char *filename,
-       /* LDAP_CONST */ char *uname,
+       LDAP_CONST char *uname,
        LDAPFriendlyMap **map ));
 
 LDAP_F( void )
@@ -1480,8 +1544,6 @@ ldap_sort_strcasecmp LDAP_P((
 
 /*
  * in url.c
- *
- * need _ext varients
  */
 LDAP_F( int )
 ldap_is_ldap_url LDAP_P((
@@ -1500,6 +1562,10 @@ ldap_url_parse LDAP_P((
        LDAP_CONST char *url,
        LDAPURLDesc **ludpp ));
 
+LDAP_F( char * )
+ldap_url_desc2str LDAP_P((
+       LDAPURLDesc *ludp ));
+
 LDAP_F( void )
 ldap_free_urldesc LDAP_P((
        LDAPURLDesc *ludp ));