X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap.h;h=5f27829e67fa73f52bdd81a870f217a12da7d3f9;hb=1a20c9a582ba56d09e1df0b3b911204f251f19fb;hp=79a1d18f8e76c4fe7a6114b2caabcba39f5c5b66;hpb=f2bcd9c762f8064013b79de866473322bda1dbf1;p=openldap diff --git a/include/ldap.h b/include/ldap.h index 79a1d18f8e..5f27829e67 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA + * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA * All rights reserved. * * Redistribution and use in source and binary forms are permitted only @@ -23,9 +23,7 @@ #ifndef _LDAP_H #define _LDAP_H -#include - -/* draft spec requires ldap.h include lber declarations */ +/* pull in lber */ #include LDAP_BEGIN_DECL @@ -46,7 +44,7 @@ LDAP_BEGIN_DECL #define LDAP_API_VERSION 2004 #define LDAP_VENDOR_NAME "OpenLDAP" /* We'll eventually release as 200 */ -#define LDAP_VENDOR_VERSION 194 +#define LDAP_VENDOR_VERSION 19905 /* OpenLDAP API Features */ #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION @@ -104,18 +102,17 @@ LDAP_BEGIN_DECL /* 0x34 - 0x0fff not defined by current draft */ -/* extended options - none */ +#define LDAP_OPT_PRIVATE_EXTENSION_BASE 0x4000 /* to 0x7FFF inclusive */ /* private and experimental options */ -#define LDAP_OPT_DNS 0x4001 /* use DN & DNS */ - /* OpenLDAP specific options */ #define LDAP_OPT_DEBUG_LEVEL 0x5001 /* debug level */ #define LDAP_OPT_TIMEOUT 0x5002 /* default timeout */ #define LDAP_OPT_REFHOPLIMIT 0x5003 /* ref hop limit */ #define LDAP_OPT_NETWORK_TIMEOUT 0x5005 /* socket level timeout */ +#define LDAP_OPT_URI 0x5006 -/* TLS options */ +/* OpenLDAP TLS options */ #define LDAP_OPT_X_TLS_CACERTFILE 0x6001 #define LDAP_OPT_X_TLS_CACERTDIR 0x6002 #define LDAP_OPT_X_TLS_CERT 0x6003 @@ -132,10 +129,21 @@ LDAP_BEGIN_DECL #define LDAP_OPT_X_TLS_ALLOW 3 #define LDAP_OPT_X_TLS_TRY 4 +/* OpenLDAP SASL options */ +#define LDAP_OPT_X_SASL_MINSSF 0x6100 +#define LDAP_OPT_X_SASL_MAXSSF 0x6101 +#define LDAP_OPT_X_SASL_ACTSSF 0x6102 + /* on/off values */ #define LDAP_OPT_ON ((void *) 1) #define LDAP_OPT_OFF ((void *) 0) +/* + * ldap_get_option() and ldap_set_option() return values. + * As later versions may return other values indicating + * failure, current applications should only compare returned + * value against LDAP_OPT_SUCCESS. + */ #define LDAP_OPT_SUCCESS 0 #define LDAP_OPT_ERROR (-1) @@ -171,17 +179,24 @@ typedef struct ldapcontrol { #define LDAP_CONTROL_MANAGEDSAIT "2.16.840.1.113730.3.4.2" /* Experimental Controls */ -#define LDAP_CONTROL_X_PASSWD_MOD_REQ "1.3.6.1.4.1.4203.666.5.1" -#define LDAP_CONTROL_X_PASSWD_MOD_RES "1.3.6.1.4.1.4203.666.5.1" +#define LDAP_CONTROL_SORTREQUEST "1.2.840.113556.1.4.473" +#define LDAP_CONTROL_SORTRESPONSE "1.2.840.113556.1.4.474" +#define LDAP_CONTROL_VLVREQUEST "2.16.840.1.113730.3.4.9" +#define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10" /* LDAP Unsolicited Notifications */ #define LDAP_NOTICE_OF_DISCONNECTION "1.3.6.1.4.1.1466.20036" #define LDAP_NOTICE_DISCONNECT LDAP_NOTICE_OF_DISCONNECTION - /* LDAP Extended Operations */ +#define LDAP_EXOP_START_TLS "1.3.6.1.4.1.1466.20037" +#define LDAP_EXOP_X_MODIFY_PASSWD "1.3.6.1.4.1.4203.666.6.1" +#define LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID ((ber_tag_t) 0x80U) +#define LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD ((ber_tag_t) 0x81U) +#define LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW ((ber_tag_t) 0x82U) +#define LDAP_TAG_EXOP_X_MODIFY_PASSWD_GEN ((ber_tag_t) 0x80U) /* * specific LDAP instantiations of BER types we know about @@ -222,8 +237,6 @@ typedef struct ldapcontrol { #define LDAP_TAG_SASL_RES_CREDS ((ber_tag_t) 0x87U) /* context specific + primitive */ - - /* possible operations a client can invoke */ #define LDAP_REQ_BIND ((ber_tag_t) 0x60U) /* application + constructed */ #define LDAP_REQ_UNBIND ((ber_tag_t) 0x42U) /* application + primitive */ @@ -251,6 +264,7 @@ typedef struct ldapcontrol { #define LDAP_RES_RENAME LDAP_RES_MODRDN /* application + constructed */ #define LDAP_RES_COMPARE ((ber_tag_t) 0x6fU) /* application + constructed */ #define LDAP_RES_EXTENDED ((ber_tag_t) 0x78U) /* V3: application + constructed */ +#define LDAP_RES_EXTENDED_PARTIAL ((ber_tag_t) 0x79U) /* V3+: application + constructed */ #define LDAP_RES_ANY ((ber_tag_t)(-1)) #define LDAP_RES_UNSOLICITED ((ber_tag_t)(0)) @@ -296,27 +310,10 @@ typedef struct ldapcontrol { #define LDAP_SCOPE_ONELEVEL ((ber_int_t) 0x0001) #define LDAP_SCOPE_SUBTREE ((ber_int_t) 0x0002) -/* for modifications */ -typedef struct ldapmod { - int mod_op; - -#define LDAP_MOD_ADD ((ber_int_t) 0x0000) -#define LDAP_MOD_DELETE ((ber_int_t) 0x0001) -#define LDAP_MOD_REPLACE ((ber_int_t) 0x0002) -#define LDAP_MOD_BVALUES ((ber_int_t) 0x0080) -/* IMPORTANT: do not use code 0x1000 (or above), - * it is used internally by the backends! - * (see ldap/servers/slapd/slap.h) - */ - - char *mod_type; - union mod_vals_u { - char **modv_strvals; - struct berval **modv_bvals; - } mod_vals; -#define mod_values mod_vals.modv_strvals -#define mod_bvalues mod_vals.modv_bvals -} LDAPMod; +/* substring filter component types */ +#define LDAP_SUBSTRING_INITIAL ((ber_tag_t) 0x80U) /* context specific */ +#define LDAP_SUBSTRING_ANY ((ber_tag_t) 0x81U) /* context specific */ +#define LDAP_SUBSTRING_FINAL ((ber_tag_t) 0x82U) /* context specific */ /* * possible error codes we can return @@ -385,7 +382,7 @@ typedef struct ldapmod { #define LDAP_OTHER 0x50 -#define LDAP_API_ERROR(n) LDAP_RANGE((n),0x51,0xff) /* 81+ */ +#define LDAP_API_ERROR(n) LDAP_RANGE((n),0x51,0x61) /* 81-97 */ #define LDAP_SERVER_DOWN 0x51 #define LDAP_LOCAL_ERROR 0x52 @@ -398,13 +395,14 @@ typedef struct ldapmod { #define LDAP_PARAM_ERROR 0x59 #define LDAP_NO_MEMORY 0x5a -#define LDAP_CONNECT_ERROR 0x5b /* new */ -#define LDAP_NOT_SUPPORTED 0x5c /* new */ -#define LDAP_CONTROL_NOT_FOUND 0x5d /* new */ -#define LDAP_NO_RESULTS_RETURNED 0x5e /* new */ -#define LDAP_MORE_RESULTS_TO_RETURN 0x5f /* new */ -#define LDAP_CLIENT_LOOP 0x60 /* new */ -#define LDAP_REFERRAL_LIMIT_EXCEEDED 0x61 /* new */ +/* not technically reserved for APIs */ +#define LDAP_CONNECT_ERROR 0x5b /* draft-ietf-ldap-c-api-xx */ +#define LDAP_NOT_SUPPORTED 0x5c /* draft-ietf-ldap-c-api-xx */ +#define LDAP_CONTROL_NOT_FOUND 0x5d /* draft-ietf-ldap-c-api-xx */ +#define LDAP_NO_RESULTS_RETURNED 0x5e /* draft-ietf-ldap-c-api-xx */ +#define LDAP_MORE_RESULTS_TO_RETURN 0x5f /* draft-ietf-ldap-c-api-xx */ +#define LDAP_CLIENT_LOOP 0x60 /* draft-ietf-ldap-c-api-xx */ +#define LDAP_REFERRAL_LIMIT_EXCEEDED 0x61 /* draft-ietf-ldap-c-api-xx */ /* * This structure represents both ldap messages and ldap responses. @@ -414,6 +412,28 @@ typedef struct ldapmod { typedef struct ldapmsg LDAPMessage; +/* for modifications */ +typedef struct ldapmod { + int mod_op; + +#define LDAP_MOD_ADD ((ber_int_t) 0x0000) +#define LDAP_MOD_DELETE ((ber_int_t) 0x0001) +#define LDAP_MOD_REPLACE ((ber_int_t) 0x0002) +#define LDAP_MOD_BVALUES ((ber_int_t) 0x0080) +/* IMPORTANT: do not use code 0x1000 (or above), + * it is used internally by the backends! + * (see ldap/servers/slapd/slap.h) + */ + + char *mod_type; + union mod_vals_u { + char **modv_strvals; + struct berval **modv_bvals; + } mod_vals; +#define mod_values mod_vals.modv_strvals +#define mod_bvalues mod_vals.modv_bvals +} LDAPMod; + /* * structures for ldap getfilter routines */ @@ -482,21 +502,22 @@ typedef struct ldap_friendly { * types for ldap URL handling */ typedef struct ldap_url_desc { - int lud_ldaps; + struct ldap_url_desc *lud_next; + char *lud_scheme; char *lud_host; int lud_port; char *lud_dn; char **lud_attrs; int lud_scope; char *lud_filter; - char **lud_exts; + char **lud_exts; } LDAPURLDesc; #define LDAP_URL_SUCCESS 0x00 /* Success */ #define LDAP_URL_ERR_MEM 0x01 /* can't allocate memory space */ #define LDAP_URL_ERR_PARAM 0x02 /* parameter is bad */ -#define LDAP_URL_ERR_NOTLDAP 0x03 /* URL doesn't begin with "ldap[s]://" */ +#define LDAP_URL_ERR_BADSCHEME 0x03 /* URL doesn't begin with "ldap[si]://" */ #define LDAP_URL_ERR_BADENCLOSURE 0x04 /* URL is missing trailing ">" */ #define LDAP_URL_ERR_BADURL 0x05 /* URL is bad */ #define LDAP_URL_ERR_BADHOST 0x06 /* host port is bad */ @@ -511,15 +532,6 @@ typedef struct ldap_url_desc { */ struct timeval; -#ifdef __MINGW32__ -# undef LDAP_F_PRE -# ifdef LIBLDAP_DECL -# define LDAP_F_PRE extern __declspec(LIBLDAP_DECL) -# else -# define LDAP_F_PRE extern -# endif -#endif - /* * in options.c: */ @@ -535,6 +547,14 @@ ldap_set_option LDAP_P(( int option, LDAP_CONST void *invalue)); +/* V3 REBIND Function Callback Prototype */ +typedef int (LDAP_REBIND_PROC) LDAP_P(( + LDAP *ld, LDAP_CONST char *url, int request, ber_int_t msgid )); + +LDAP_F( int ) +ldap_set_rebind_proc LDAP_P(( + LDAP *ld, + LDAP_REBIND_PROC *ldap_proc)); /* * in controls.c: @@ -547,7 +567,24 @@ LDAP_F( void ) ldap_controls_free LDAP_P(( LDAPControl **ctrls )); - +/* + * in dnssrv.c: + */ +LDAP_F( int ) +ldap_domain2dn LDAP_P(( + LDAP_CONST char* domain, + char** dn )); + +LDAP_F( int ) +ldap_dn2domain LDAP_P(( + LDAP_CONST char* dn, + char** domain )); + +LDAP_F( int ) +ldap_domain2hostlist LDAP_P(( + LDAP_CONST char *domain, + char** hostlist )); + /* * in extended.c: */ @@ -578,21 +615,30 @@ ldap_parse_extended_result LDAP_P(( struct berval **retdatap, int freeit )); +LDAP_F( int ) +ldap_parse_extended_partial LDAP_P(( + LDAP *ld, + LDAPMessage *res, + char **retoidp, + struct berval **retdatap, + LDAPControl ***serverctrls, + int freeit )); + /* * in abandon.c: */ LDAP_F( int ) -ldap_abandon LDAP_P(( - LDAP *ld, - int msgid )); - -LDAP_F( int ) ldap_abandon_ext LDAP_P(( LDAP *ld, int msgid, LDAPControl **serverctrls, LDAPControl **clientctrls )); +LDAP_F( int ) +ldap_abandon LDAP_P(( /* deprecated */ + LDAP *ld, + int msgid )); + /* * in add.c: @@ -615,13 +661,13 @@ ldap_add_ext_s LDAP_P(( LDAPControl **clientctrls )); LDAP_F( int ) -ldap_add LDAP_P(( +ldap_add LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs )); LDAP_F( int ) -ldap_add_s LDAP_P(( +ldap_add_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs )); @@ -640,6 +686,17 @@ ldap_sasl_bind LDAP_P(( LDAPControl **clientctrls, int *msgidp )); +LDAP_F( int ) +ldap_negotiated_sasl_bind_s LDAP_P(( + LDAP *ld, + LDAP_CONST char *dn, /* usually NULL */ + LDAP_CONST char *authenticationId, + LDAP_CONST char *authorizationId, /* usually NULL */ + LDAP_CONST char *saslMechanism, + struct berval *passPhrase, + LDAPControl **serverControls, + LDAPControl **clientControls )); + LDAP_F( int ) ldap_sasl_bind_s LDAP_P(( LDAP *ld, @@ -662,30 +719,19 @@ ldap_parse_sasl_bind_result LDAP_P(( * (deprecated) */ LDAP_F( int ) -ldap_bind LDAP_P(( +ldap_bind LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who, LDAP_CONST char *passwd, int authmethod )); LDAP_F( int ) -ldap_bind_s LDAP_P(( +ldap_bind_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who, LDAP_CONST char *cred, int authmethod )); -LDAP_F( void ) -ldap_set_rebind_proc LDAP_P(( - LDAP *ld, - int (*rebindproc) LDAP_P(( - LDAP *ld, - char **dnp, - char **passwdp, - int *authmethodp, - int freeit )))); - - /* * in sbind.c: */ @@ -707,27 +753,27 @@ ldap_simple_bind_s LDAP_P(( * (deprecated) */ LDAP_F( int ) -ldap_kerberos_bind_s LDAP_P(( +ldap_kerberos_bind_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); LDAP_F( int ) -ldap_kerberos_bind1 LDAP_P(( +ldap_kerberos_bind1 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); LDAP_F( int ) -ldap_kerberos_bind1_s LDAP_P(( +ldap_kerberos_bind1_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); LDAP_F( int ) -ldap_kerberos_bind2 LDAP_P(( +ldap_kerberos_bind2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); LDAP_F( int ) -ldap_kerberos_bind2_s LDAP_P(( +ldap_kerberos_bind2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); @@ -780,14 +826,14 @@ ldap_compare_ext_s LDAP_P(( LDAPControl **clientctrls )); LDAP_F( int ) -ldap_compare LDAP_P(( +ldap_compare LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *attr, LDAP_CONST char *value )); LDAP_F( int ) -ldap_compare_s LDAP_P(( +ldap_compare_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *attr, @@ -813,12 +859,12 @@ ldap_delete_ext_s LDAP_P(( LDAPControl **clientctrls )); LDAP_F( int ) -ldap_delete LDAP_P(( +ldap_delete LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn )); LDAP_F( int ) -ldap_delete_s LDAP_P(( +ldap_delete_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn )); @@ -874,13 +920,13 @@ ldap_modify_ext_s LDAP_P(( LDAPControl **clientctrls )); LDAP_F( int ) -ldap_modify LDAP_P(( +ldap_modify LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **mods )); LDAP_F( int ) -ldap_modify_s LDAP_P(( +ldap_modify_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **mods )); @@ -894,8 +940,8 @@ ldap_rename LDAP_P(( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, - int deleteoldrdn, LDAP_CONST char *newSuperior, + int deleteoldrdn, LDAPControl **sctrls, LDAPControl **cctrls, int *msgidp )); @@ -905,69 +951,48 @@ ldap_rename_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, - int deleteoldrdn, LDAP_CONST char *newSuperior, + int deleteoldrdn, LDAPControl **sctrls, LDAPControl **cctrls )); LDAP_F( int ) -ldap_rename_ext LDAP_P(( - LDAP *ld, - LDAP_CONST char *dn, - LDAP_CONST char *newrdn, - LDAP_CONST char *newparent, - int deleteoldrdn, - LDAPControl **serverctrls, - LDAPControl **clientctrls, - int *msgidp )); - -LDAP_F( int ) -ldap_rename_ext_s LDAP_P(( - LDAP *ld, - LDAP_CONST char *dn, - LDAP_CONST char *newrdn, - LDAP_CONST char *newparent, - int deleteoldrdn, - LDAPControl **serverctrls, - LDAPControl **clientctrls )); - -LDAP_F( int ) -ldap_rename2 LDAP_P(( +ldap_rename2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, - int deleteoldrdn, - LDAP_CONST char *newSuperior )); + LDAP_CONST char *newSuperior, + int deleteoldrdn )); LDAP_F( int ) -ldap_rename2_s LDAP_P(( +ldap_rename2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, - int deleteoldrdn, - LDAP_CONST char *newSuperior)); + LDAP_CONST char *newSuperior, + int deleteoldrdn )); LDAP_F( int ) -ldap_modrdn LDAP_P(( +ldap_modrdn LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )); LDAP_F( int ) -ldap_modrdn_s LDAP_P(( +ldap_modrdn_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )); LDAP_F( int ) -ldap_modrdn2 LDAP_P(( +ldap_modrdn2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, int deleteoldrdn )); LDAP_F( int ) -ldap_modrdn2_s LDAP_P(( +ldap_modrdn2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, @@ -978,15 +1003,29 @@ ldap_modrdn2_s LDAP_P(( * in open.c: */ LDAP_F( LDAP *) -ldap_open LDAP_P(( +ldap_init LDAP_P(( LDAP_CONST char *host, int port )); LDAP_F( LDAP *) -ldap_init LDAP_P(( +ldap_open LDAP_P(( /* deprecated */ LDAP_CONST char *host, int port )); +LDAP_F( int ) +ldap_create LDAP_P(( + LDAP **ldp )); + +LDAP_F( int ) +ldap_initialize LDAP_P(( + LDAP **ldp, + LDAP_CONST char *url )); + +LDAP_F( int ) +ldap_start_tls_s LDAP_P(( + LDAP *ld, + LDAPControl **serverctrls, + LDAPControl **clientctrls )); /* * in messages.c: @@ -1107,14 +1146,11 @@ LDAP_F( char * ) ldap_normalize_dn LDAP_P(( LDAP_CONST char *dn )); -LDAP_F( char ** ) -ldap_explode_dns LDAP_P(( /* deprecated */ - LDAP_CONST char *dn )); - -LDAP_F( int ) -ldap_is_dns_dn LDAP_P(( /* deprecated */ - LDAP_CONST char *dn )); +LDAP_F( char * ) +ldap_dn2dcedn LDAP_P(( LDAP_CONST char *dn )); /* deprecated */ +LDAP_F( char * ) +ldap_dcedn2dn LDAP_P(( LDAP_CONST char *dce )); /* deprecated */ /* * in getattr.c @@ -1224,7 +1260,7 @@ ldap_search_ext_s LDAP_P(( LDAPMessage **res )); LDAP_F( int ) -ldap_search LDAP_P(( +ldap_search LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, int scope, @@ -1233,7 +1269,7 @@ ldap_search LDAP_P(( int attrsonly )); LDAP_F( int ) -ldap_search_s LDAP_P(( +ldap_search_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, int scope, @@ -1243,7 +1279,7 @@ ldap_search_s LDAP_P(( LDAPMessage **res )); LDAP_F( int ) -ldap_search_st LDAP_P(( +ldap_search_st LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, int scope, @@ -1255,10 +1291,11 @@ ldap_search_st LDAP_P(( /* - * in ufn.c + * in ufn.c + * (deprecated) */ LDAP_F( int ) -ldap_ufn_search_c LDAP_P(( +ldap_ufn_search_c LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, char **attrs, @@ -1268,7 +1305,7 @@ ldap_ufn_search_c LDAP_P(( void *cancelparm )); LDAP_F( int ) -ldap_ufn_search_ct LDAP_P(( +ldap_ufn_search_ct LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, char **attrs, @@ -1281,7 +1318,7 @@ ldap_ufn_search_ct LDAP_P(( char *tag3 )); LDAP_F( int ) -ldap_ufn_search_s LDAP_P(( +ldap_ufn_search_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, char **attrs, @@ -1289,17 +1326,17 @@ ldap_ufn_search_s LDAP_P(( LDAPMessage **res )); LDAP_F( LDAPFiltDesc *) -ldap_ufn_setfilter LDAP_P(( +ldap_ufn_setfilter LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *fname )); LDAP_F( void ) -ldap_ufn_setprefix LDAP_P(( +ldap_ufn_setprefix LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *prefix )); LDAP_F( int ) -ldap_ufn_timeout LDAP_P(( +ldap_ufn_timeout LDAP_P(( /* deprecated */ void *tvparam )); @@ -1307,11 +1344,11 @@ ldap_ufn_timeout LDAP_P(( * in unbind.c */ LDAP_F( int ) -ldap_unbind LDAP_P(( +ldap_unbind LDAP_P(( /* deprecated */ LDAP *ld )); LDAP_F( int ) -ldap_unbind_s LDAP_P(( +ldap_unbind_s LDAP_P(( /* deprecated */ LDAP *ld )); LDAP_F( int ) @@ -1328,34 +1365,35 @@ ldap_unbind_ext_s LDAP_P(( /* * in getfilter.c + * (deprecated) */ LDAP_F( LDAPFiltDesc *) -ldap_init_getfilter LDAP_P(( +ldap_init_getfilter LDAP_P(( /* deprecated */ LDAP_CONST char *fname )); LDAP_F( LDAPFiltDesc *) -ldap_init_getfilter_buf LDAP_P(( +ldap_init_getfilter_buf LDAP_P(( /* deprecated */ /* LDAP_CONST */ char *buf, ber_len_t buflen )); LDAP_F( LDAPFiltInfo *) -ldap_getfirstfilter LDAP_P(( +ldap_getfirstfilter LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp, /* LDAP_CONST */ char *tagpat, /* LDAP_CONST */ char *value )); LDAP_F( LDAPFiltInfo *) -ldap_getnextfilter LDAP_P(( +ldap_getnextfilter LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp )); LDAP_F( void ) -ldap_setfilteraffixes LDAP_P(( +ldap_setfilteraffixes LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp, LDAP_CONST char *prefix, LDAP_CONST char *suffix )); LDAP_F( void ) -ldap_build_filter LDAP_P(( +ldap_build_filter LDAP_P(( /* deprecated */ char *buf, ber_len_t buflen, LDAP_CONST char *pattern, @@ -1408,32 +1446,35 @@ ldap_mods_free LDAP_P(( /* * in friendly.c + * (deprecated) */ LDAP_F( char * ) -ldap_friendly_name LDAP_P(( +ldap_friendly_name LDAP_P(( /* deprecated */ LDAP_CONST char *filename, /* LDAP_CONST */ char *uname, LDAPFriendlyMap **map )); LDAP_F( void ) -ldap_free_friendlymap LDAP_P(( +ldap_free_friendlymap LDAP_P(( /* deprecated */ LDAPFriendlyMap **map )); /* * in cldap.c + * (deprecated) */ LDAP_F( LDAP * ) -cldap_open LDAP_P(( +cldap_open LDAP_P(( /* deprecated */ LDAP_CONST char *host, int port )); LDAP_F( void ) -cldap_close LDAP_P(( +cldap_close LDAP_P(( /* deprecated */ LDAP *ld )); LDAP_F( int ) -cldap_search_s LDAP_P(( LDAP *ld, +cldap_search_s LDAP_P(( /* deprecated */ + LDAP *ld, LDAP_CONST char *base, int scope, LDAP_CONST char *filter, @@ -1443,7 +1484,7 @@ cldap_search_s LDAP_P(( LDAP *ld, char *logdn )); LDAP_F( void ) -cldap_setretryinfo LDAP_P(( +cldap_setretryinfo LDAP_P(( /* deprecated */ LDAP *ld, int tries, int timeout )); @@ -1452,19 +1493,27 @@ cldap_setretryinfo LDAP_P(( /* * in sort.c */ +typedef int (LDAP_SORT_AD_CMP_PROC) LDAP_P(( + LDAP_CONST char *left, + LDAP_CONST char *right )); + +typedef int (LDAP_SORT_AV_CMP_PROC) LDAP_P(( + LDAP_CONST void *left, + LDAP_CONST void *right )); + LDAP_F( int ) ldap_sort_entries LDAP_P(( LDAP *ld, LDAPMessage **chain, LDAP_CONST char *attr, - int (*cmp) (LDAP_CONST char *, LDAP_CONST char *) )); + LDAP_SORT_AD_CMP_PROC *cmp )); -LDAP_F( int ) +LDAP_F( int ) /* deprecated */ ldap_sort_values LDAP_P(( LDAP *ld, char **vals, - int (*cmp) (LDAP_CONST void *, LDAP_CONST void *) )); + LDAP_SORT_AV_CMP_PROC *cmp )); -LDAP_F( int ) +LDAP_F( int ) /* deprecated */ ldap_sort_strcasecmp LDAP_P(( LDAP_CONST void *a, LDAP_CONST void *b )); @@ -1483,6 +1532,10 @@ LDAP_F( int ) ldap_is_ldaps_url LDAP_P(( LDAP_CONST char *url )); +LDAP_F( int ) +ldap_is_ldapi_url LDAP_P(( + LDAP_CONST char *url )); + LDAP_F( int ) ldap_url_parse LDAP_P(( LDAP_CONST char *url, @@ -1513,49 +1566,75 @@ ldap_url_search_st LDAP_P(( struct timeval *timeout, LDAPMessage **res )); - +/* + * in sortctrl.c + */ /* - * in charset.c - * DEPRECATED + * structure for a sort-key */ -LDAP_F( void ) -ldap_set_string_translators LDAP_P(( - LDAP *ld, - BERTranslateProc encode_proc, - BERTranslateProc decode_proc )); +typedef struct ldapsortkey { + char * attributeType; + char * orderingRule; + int reverseOrder; +} LDAPSortKey; LDAP_F( int ) -ldap_translate_from_t61 LDAP_P(( - LDAP *ld, - char **bufp, - ber_len_t *lenp, - int free_input )); - -LDAP_F( int ) -ldap_translate_to_t61 LDAP_P(( - LDAP *ld, - char **bufp, - ber_len_t *lenp, - int free_input )); +ldap_create_sort_keylist LDAP_P(( + LDAPSortKey ***sortKeyList, + char *keyString )); LDAP_F( void ) -ldap_enable_translation LDAP_P(( - LDAP *ld, - LDAPMessage *entry, - int enable )); +ldap_free_sort_keylist LDAP_P(( + LDAPSortKey **sortkeylist )); LDAP_F( int ) -ldap_t61_to_8859 LDAP_P(( - char **bufp, - ber_len_t *buflenp, - int free_input )); +ldap_create_sort_control LDAP_P(( + LDAP *ld, + LDAPSortKey **keyList, + int ctl_iscritical, + LDAPControl **ctrlp )); LDAP_F( int ) -ldap_8859_to_t61 LDAP_P(( - char **bufp, - ber_len_t *buflenp, - int free_input )); +ldap_parse_sort_control LDAP_P(( + LDAP *ld, + LDAPControl **ctrlp, + unsigned long *result, + char **attribute )); -LDAP_END_DECL +/* + * in vlvctrl.c + */ + +/* + * structure for virtul list. + */ +typedef struct ldapvlvinfo { + int ldvlv_version; + unsigned long ldvlv_before_count; + unsigned long ldvlv_after_count; + unsigned long ldvlv_offset; + unsigned long ldvlv_count; + struct berval *ldvlv_attrvalue; + struct berval *ldvlv_context; + void *ldvlv_extradata; +} LDAPVLVInfo; + +LDAP_F( int ) +ldap_create_vlv_control LDAP_P(( + LDAP *ld, + LDAPVLVInfo *ldvlistp, + LDAPControl **ctrlp )); + +LDAP_F( int ) +ldap_parse_vlv_control LDAP_P(( + LDAP *ld, + LDAPControl **ctrls, + unsigned long *target_posp, + unsigned long *list_countp, + struct berval **contextp, + int *errcodep )); + + +LDAP_END_DECL #endif /* _LDAP_H */