X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap.h;h=5f27829e67fa73f52bdd81a870f217a12da7d3f9;hb=1a20c9a582ba56d09e1df0b3b911204f251f19fb;hp=3591417684aa97f83266e310e3811d0b07c51167;hpb=d0555fffe65fe7ffe18a3dcd1260d43fdf7572f5;p=openldap diff --git a/include/ldap.h b/include/ldap.h index 3591417684..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 @@ -44,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 @@ -105,8 +105,6 @@ LDAP_BEGIN_DECL #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 */ @@ -140,6 +138,12 @@ LDAP_BEGIN_DECL #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) @@ -175,13 +179,16 @@ typedef struct ldapcontrol { #define LDAP_CONTROL_MANAGEDSAIT "2.16.840.1.113730.3.4.2" /* Experimental Controls */ -#define LDAP_CONTROL_X_MODIFY_PASSWD "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" @@ -375,7 +382,7 @@ typedef struct ldapcontrol { #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 @@ -388,13 +395,14 @@ typedef struct ldapcontrol { #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. @@ -495,8 +503,7 @@ typedef struct ldap_friendly { */ typedef struct ldap_url_desc { struct ldap_url_desc *lud_next; - unsigned long lud_properties; - int lud_protocol; + char *lud_scheme; char *lud_host; int lud_port; char *lud_dn; @@ -506,19 +513,11 @@ typedef struct ldap_url_desc { char **lud_exts; } LDAPURLDesc; -/* lud_properties */ -#define LDAP_URL_USE_SSL 0x00000001 - -/* lud_protocol */ -#define LDAP_PROTO_TCP 0x00 -#define LDAP_PROTO_UDP 0x01 -#define LDAP_PROTO_LOCAL 0x02 - #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 */ @@ -536,44 +535,52 @@ struct timeval; /* * in options.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_get_option LDAP_P(( LDAP *ld, int option, void *outvalue)); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_set_option LDAP_P(( LDAP *ld, 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: */ -LIBLDAP_F( void ) +LDAP_F( void ) ldap_control_free LDAP_P(( LDAPControl *ctrl )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_controls_free LDAP_P(( LDAPControl **ctrls )); /* * in dnssrv.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_domain2dn LDAP_P(( LDAP_CONST char* domain, char** dn )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_dn2domain LDAP_P(( LDAP_CONST char* dn, char** domain )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_domain2hostlist LDAP_P(( LDAP_CONST char *domain, char** hostlist )); @@ -581,7 +588,7 @@ ldap_domain2hostlist LDAP_P(( /* * in extended.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_extended_operation LDAP_P(( LDAP *ld, LDAP_CONST char *reqoid, @@ -590,7 +597,7 @@ ldap_extended_operation LDAP_P(( LDAPControl **clientctrls, int *msgidp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_extended_operation_s LDAP_P(( LDAP *ld, LDAP_CONST char *reqoid, @@ -600,7 +607,7 @@ ldap_extended_operation_s LDAP_P(( char **retoidp, struct berval **retdatap )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_parse_extended_result LDAP_P(( LDAP *ld, LDAPMessage *res, @@ -608,26 +615,35 @@ 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: */ -LIBLDAP_F( int ) -ldap_abandon LDAP_P(( - LDAP *ld, - int msgid )); - -LIBLDAP_F( int ) +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: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_add_ext LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -636,7 +652,7 @@ ldap_add_ext LDAP_P(( LDAPControl **clientctrls, int *msgidp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_add_ext_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -644,14 +660,14 @@ ldap_add_ext_s LDAP_P(( LDAPControl **serverctrls, LDAPControl **clientctrls )); -LIBLDAP_F( int ) -ldap_add LDAP_P(( +LDAP_F( int ) +ldap_add LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs )); -LIBLDAP_F( int ) -ldap_add_s LDAP_P(( +LDAP_F( int ) +ldap_add_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs )); @@ -660,7 +676,7 @@ ldap_add_s LDAP_P(( /* * in sasl.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_sasl_bind LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -670,7 +686,7 @@ ldap_sasl_bind LDAP_P(( LDAPControl **clientctrls, int *msgidp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_negotiated_sasl_bind_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, /* usually NULL */ @@ -681,7 +697,7 @@ ldap_negotiated_sasl_bind_s LDAP_P(( LDAPControl **serverControls, LDAPControl **clientControls )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_sasl_bind_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -691,7 +707,7 @@ ldap_sasl_bind_s LDAP_P(( LDAPControl **clientctrls, struct berval **servercredp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_parse_sasl_bind_result LDAP_P(( LDAP *ld, LDAPMessage *res, @@ -702,41 +718,30 @@ ldap_parse_sasl_bind_result LDAP_P(( * in bind.c: * (deprecated) */ -LIBLDAP_F( int ) -ldap_bind LDAP_P(( +LDAP_F( int ) +ldap_bind LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who, LDAP_CONST char *passwd, int authmethod )); -LIBLDAP_F( int ) -ldap_bind_s LDAP_P(( +LDAP_F( int ) +ldap_bind_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who, LDAP_CONST char *cred, int authmethod )); -LIBLDAP_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: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_simple_bind LDAP_P(( LDAP *ld, LDAP_CONST char *who, LDAP_CONST char *passwd )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_simple_bind_s LDAP_P(( LDAP *ld, LDAP_CONST char *who, @@ -747,28 +752,28 @@ ldap_simple_bind_s LDAP_P(( * in kbind.c: * (deprecated) */ -LIBLDAP_F( int ) -ldap_kerberos_bind_s LDAP_P(( +LDAP_F( int ) +ldap_kerberos_bind_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); -LIBLDAP_F( int ) -ldap_kerberos_bind1 LDAP_P(( +LDAP_F( int ) +ldap_kerberos_bind1 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); -LIBLDAP_F( int ) -ldap_kerberos_bind1_s LDAP_P(( +LDAP_F( int ) +ldap_kerberos_bind1_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); -LIBLDAP_F( int ) -ldap_kerberos_bind2 LDAP_P(( +LDAP_F( int ) +ldap_kerberos_bind2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); -LIBLDAP_F( int ) -ldap_kerberos_bind2_s LDAP_P(( +LDAP_F( int ) +ldap_kerberos_bind2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); @@ -776,32 +781,32 @@ ldap_kerberos_bind2_s LDAP_P(( * in cache.c * (deprecated) */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_enable_cache LDAP_P(( LDAP *ld, long timeout, ber_len_t maxmem )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_disable_cache LDAP_P(( LDAP *ld )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_set_cache_options LDAP_P(( LDAP *ld, unsigned long opts )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_destroy_cache LDAP_P(( LDAP *ld )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_flush_cache LDAP_P(( LDAP *ld )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_uncache_entry LDAP_P(( LDAP *ld, LDAP_CONST char *dn )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_uncache_request LDAP_P(( LDAP *ld, int msgid )); /* * in compare.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_compare_ext LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -811,7 +816,7 @@ ldap_compare_ext LDAP_P(( LDAPControl **clientctrls, int *msgidp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_compare_ext_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -820,15 +825,15 @@ ldap_compare_ext_s LDAP_P(( LDAPControl **serverctrls, LDAPControl **clientctrls )); -LIBLDAP_F( int ) -ldap_compare LDAP_P(( +LDAP_F( int ) +ldap_compare LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *attr, LDAP_CONST char *value )); -LIBLDAP_F( int ) -ldap_compare_s LDAP_P(( +LDAP_F( int ) +ldap_compare_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *attr, @@ -838,7 +843,7 @@ ldap_compare_s LDAP_P(( /* * in delete.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_delete_ext LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -846,20 +851,20 @@ ldap_delete_ext LDAP_P(( LDAPControl **clientctrls, int *msgidp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_delete_ext_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, LDAPControl **serverctrls, LDAPControl **clientctrls )); -LIBLDAP_F( int ) -ldap_delete LDAP_P(( +LDAP_F( int ) +ldap_delete LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn )); -LIBLDAP_F( int ) -ldap_delete_s LDAP_P(( +LDAP_F( int ) +ldap_delete_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn )); @@ -867,7 +872,7 @@ ldap_delete_s LDAP_P(( /* * in error.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_parse_result LDAP_P(( LDAP *ld, LDAPMessage *res, @@ -878,17 +883,17 @@ ldap_parse_result LDAP_P(( LDAPControl ***serverctrls, int freeit )); -LIBLDAP_F( char *) +LDAP_F( char *) ldap_err2string LDAP_P(( int err )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_result2error LDAP_P(( /* deprecated */ LDAP *ld, LDAPMessage *r, int freeit )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_perror LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *s )); @@ -897,7 +902,7 @@ ldap_perror LDAP_P(( /* deprecated */ /* * in modify.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_modify_ext LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -906,7 +911,7 @@ ldap_modify_ext LDAP_P(( LDAPControl **clientctrls, int *msgidp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_modify_ext_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -914,14 +919,14 @@ ldap_modify_ext_s LDAP_P(( LDAPControl **serverctrls, LDAPControl **clientctrls )); -LIBLDAP_F( int ) -ldap_modify LDAP_P(( +LDAP_F( int ) +ldap_modify LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **mods )); -LIBLDAP_F( int ) -ldap_modify_s LDAP_P(( +LDAP_F( int ) +ldap_modify_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **mods )); @@ -930,7 +935,7 @@ ldap_modify_s LDAP_P(( /* * in modrdn.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_rename LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -941,7 +946,7 @@ ldap_rename LDAP_P(( LDAPControl **cctrls, int *msgidp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_rename_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -951,64 +956,43 @@ ldap_rename_s LDAP_P(( LDAPControl **sctrls, LDAPControl **cctrls )); -LIBLDAP_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 )); - -LIBLDAP_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 )); - -LIBLDAP_F( int ) -ldap_rename2 LDAP_P(( +LDAP_F( int ) +ldap_rename2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, LDAP_CONST char *newSuperior, int deleteoldrdn )); -LIBLDAP_F( int ) -ldap_rename2_s LDAP_P(( +LDAP_F( int ) +ldap_rename2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, LDAP_CONST char *newSuperior, int deleteoldrdn )); -LIBLDAP_F( int ) -ldap_modrdn LDAP_P(( +LDAP_F( int ) +ldap_modrdn LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )); -LIBLDAP_F( int ) -ldap_modrdn_s LDAP_P(( +LDAP_F( int ) +ldap_modrdn_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )); -LIBLDAP_F( int ) -ldap_modrdn2 LDAP_P(( +LDAP_F( int ) +ldap_modrdn2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, int deleteoldrdn )); -LIBLDAP_F( int ) -ldap_modrdn2_s LDAP_P(( +LDAP_F( int ) +ldap_modrdn2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, @@ -1018,27 +1002,27 @@ ldap_modrdn2_s LDAP_P(( /* * in open.c: */ -LIBLDAP_F( LDAP *) -ldap_open LDAP_P(( +LDAP_F( LDAP *) +ldap_init LDAP_P(( LDAP_CONST char *host, int port )); -LIBLDAP_F( LDAP *) -ldap_init LDAP_P(( +LDAP_F( LDAP *) +ldap_open LDAP_P(( /* deprecated */ LDAP_CONST char *host, int port )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_create LDAP_P(( LDAP **ldp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_initialize LDAP_P(( LDAP **ldp, LDAP_CONST char *url )); -LIBLDAP_F( int ) -ldap_start_tls LDAP_P(( +LDAP_F( int ) +ldap_start_tls_s LDAP_P(( LDAP *ld, LDAPControl **serverctrls, LDAPControl **clientctrls )); @@ -1046,17 +1030,17 @@ ldap_start_tls LDAP_P(( /* * in messages.c: */ -LIBLDAP_F( LDAPMessage *) +LDAP_F( LDAPMessage *) ldap_first_message LDAP_P(( LDAP *ld, LDAPMessage *chain )); -LIBLDAP_F( LDAPMessage *) +LDAP_F( LDAPMessage *) ldap_next_message LDAP_P(( LDAP *ld, LDAPMessage *msg )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_count_messages LDAP_P(( LDAP *ld, LDAPMessage *chain )); @@ -1065,22 +1049,22 @@ ldap_count_messages LDAP_P(( /* * in references.c: */ -LIBLDAP_F( LDAPMessage *) +LDAP_F( LDAPMessage *) ldap_first_reference LDAP_P(( LDAP *ld, LDAPMessage *chain )); -LIBLDAP_F( LDAPMessage *) +LDAP_F( LDAPMessage *) ldap_next_reference LDAP_P(( LDAP *ld, LDAPMessage *ref )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_count_references LDAP_P(( LDAP *ld, LDAPMessage *chain )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_parse_reference LDAP_P(( LDAP *ld, LDAPMessage *ref, @@ -1092,22 +1076,22 @@ ldap_parse_reference LDAP_P(( /* * in getentry.c: */ -LIBLDAP_F( LDAPMessage *) +LDAP_F( LDAPMessage *) ldap_first_entry LDAP_P(( LDAP *ld, LDAPMessage *chain )); -LIBLDAP_F( LDAPMessage *) +LDAP_F( LDAPMessage *) ldap_next_entry LDAP_P(( LDAP *ld, LDAPMessage *entry )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_count_entries LDAP_P(( LDAP *ld, LDAPMessage *chain )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_get_entry_controls LDAP_P(( LDAP *ld, LDAPMessage *entry, @@ -1117,12 +1101,12 @@ ldap_get_entry_controls LDAP_P(( /* * in addentry.c */ -LIBLDAP_F( LDAPMessage *) +LDAP_F( LDAPMessage *) ldap_delete_result_entry LDAP_P(( LDAPMessage **list, LDAPMessage *e )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_add_result_entry LDAP_P(( LDAPMessage **list, LDAPMessage *e )); @@ -1131,61 +1115,53 @@ ldap_add_result_entry LDAP_P(( /* * in getdn.c */ -LIBLDAP_F( char * ) +LDAP_F( char * ) ldap_get_dn LDAP_P(( LDAP *ld, LDAPMessage *entry )); -LIBLDAP_F( char * ) +LDAP_F( char * ) ldap_dn2ufn LDAP_P(( LDAP_CONST char *dn )); -LIBLDAP_F( char ** ) +LDAP_F( char ** ) ldap_explode_dn LDAP_P(( LDAP_CONST char *dn, int notypes )); -LIBLDAP_F( char ** ) +LDAP_F( char ** ) ldap_explode_rdn LDAP_P(( LDAP_CONST char *rdn, int notypes )); -LIBLDAP_F( char * ) +LDAP_F( char * ) ldap_parent_dn LDAP_P(( LDAP_CONST char *dn )); -LIBLDAP_F( char * ) +LDAP_F( char * ) ldap_relative_dn LDAP_P(( LDAP_CONST char *dn )); -LIBLDAP_F( char * ) +LDAP_F( char * ) ldap_normalize_dn LDAP_P(( LDAP_CONST char *dn )); -LIBLDAP_F( char ** ) -ldap_explode_dns LDAP_P(( /* deprecated */ - LDAP_CONST char *dn )); - -LIBLDAP_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 */ -LIBLDAP_F( char * ) -ldap_dn2dcedn LDAP_P(( LDAP_CONST char *dn )); - -LIBLDAP_F( char * ) -ldap_dcedn2dn LDAP_P(( LDAP_CONST char *dce )); +LDAP_F( char * ) +ldap_dcedn2dn LDAP_P(( LDAP_CONST char *dce )); /* deprecated */ /* * in getattr.c */ -LIBLDAP_F( char *) +LDAP_F( char *) ldap_first_attribute LDAP_P(( LDAP *ld, LDAPMessage *entry, BerElement **ber )); -LIBLDAP_F( char *) +LDAP_F( char *) ldap_next_attribute LDAP_P(( LDAP *ld, LDAPMessage *entry, @@ -1195,38 +1171,38 @@ ldap_next_attribute LDAP_P(( /* * in getvalues.c */ -LIBLDAP_F( char **) +LDAP_F( char **) ldap_get_values LDAP_P(( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )); -LIBLDAP_F( struct berval **) +LDAP_F( struct berval **) ldap_get_values_len LDAP_P(( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_count_values LDAP_P(( char **vals )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_count_values_len LDAP_P(( struct berval **vals )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_value_free LDAP_P(( char **vals )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_value_free_len LDAP_P(( struct berval **vals )); /* * in result.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_result LDAP_P(( LDAP *ld, int msgid, @@ -1234,19 +1210,19 @@ ldap_result LDAP_P(( struct timeval *timeout, LDAPMessage **result )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_msgtype LDAP_P(( LDAPMessage *lm )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_msgid LDAP_P(( LDAPMessage *lm )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_msgfree LDAP_P(( LDAPMessage *lm )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_msgdelete LDAP_P(( LDAP *ld, int msgid )); @@ -1255,7 +1231,7 @@ ldap_msgdelete LDAP_P(( /* * in search.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_search_ext LDAP_P(( LDAP *ld, LDAP_CONST char *base, @@ -1269,7 +1245,7 @@ ldap_search_ext LDAP_P(( int sizelimit, int *msgidp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_search_ext_s LDAP_P(( LDAP *ld, LDAP_CONST char *base, @@ -1283,8 +1259,8 @@ ldap_search_ext_s LDAP_P(( int sizelimit, LDAPMessage **res )); -LIBLDAP_F( int ) -ldap_search LDAP_P(( +LDAP_F( int ) +ldap_search LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, int scope, @@ -1292,8 +1268,8 @@ ldap_search LDAP_P(( char **attrs, int attrsonly )); -LIBLDAP_F( int ) -ldap_search_s LDAP_P(( +LDAP_F( int ) +ldap_search_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, int scope, @@ -1302,8 +1278,8 @@ ldap_search_s LDAP_P(( int attrsonly, LDAPMessage **res )); -LIBLDAP_F( int ) -ldap_search_st LDAP_P(( +LDAP_F( int ) +ldap_search_st LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, int scope, @@ -1315,10 +1291,11 @@ ldap_search_st LDAP_P(( /* - * in ufn.c + * in ufn.c + * (deprecated) */ -LIBLDAP_F( int ) -ldap_ufn_search_c LDAP_P(( +LDAP_F( int ) +ldap_ufn_search_c LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, char **attrs, @@ -1327,8 +1304,8 @@ ldap_ufn_search_c LDAP_P(( int (*cancelproc)( void *cl ), void *cancelparm )); -LIBLDAP_F( int ) -ldap_ufn_search_ct LDAP_P(( +LDAP_F( int ) +ldap_ufn_search_ct LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, char **attrs, @@ -1340,47 +1317,47 @@ ldap_ufn_search_ct LDAP_P(( char *tag2, char *tag3 )); -LIBLDAP_F( int ) -ldap_ufn_search_s LDAP_P(( +LDAP_F( int ) +ldap_ufn_search_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, char **attrs, int attrsonly, LDAPMessage **res )); -LIBLDAP_F( LDAPFiltDesc *) -ldap_ufn_setfilter LDAP_P(( +LDAP_F( LDAPFiltDesc *) +ldap_ufn_setfilter LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *fname )); -LIBLDAP_F( void ) -ldap_ufn_setprefix LDAP_P(( +LDAP_F( void ) +ldap_ufn_setprefix LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *prefix )); -LIBLDAP_F( int ) -ldap_ufn_timeout LDAP_P(( +LDAP_F( int ) +ldap_ufn_timeout LDAP_P(( /* deprecated */ void *tvparam )); /* * in unbind.c */ -LIBLDAP_F( int ) -ldap_unbind LDAP_P(( +LDAP_F( int ) +ldap_unbind LDAP_P(( /* deprecated */ LDAP *ld )); -LIBLDAP_F( int ) -ldap_unbind_s LDAP_P(( +LDAP_F( int ) +ldap_unbind_s LDAP_P(( /* deprecated */ LDAP *ld )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_unbind_ext LDAP_P(( LDAP *ld, LDAPControl **serverctrls, LDAPControl **clientctrls)); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_unbind_ext_s LDAP_P(( LDAP *ld, LDAPControl **serverctrls, @@ -1388,34 +1365,35 @@ ldap_unbind_ext_s LDAP_P(( /* * in getfilter.c + * (deprecated) */ -LIBLDAP_F( LDAPFiltDesc *) -ldap_init_getfilter LDAP_P(( +LDAP_F( LDAPFiltDesc *) +ldap_init_getfilter LDAP_P(( /* deprecated */ LDAP_CONST char *fname )); -LIBLDAP_F( LDAPFiltDesc *) -ldap_init_getfilter_buf LDAP_P(( +LDAP_F( LDAPFiltDesc *) +ldap_init_getfilter_buf LDAP_P(( /* deprecated */ /* LDAP_CONST */ char *buf, ber_len_t buflen )); -LIBLDAP_F( LDAPFiltInfo *) -ldap_getfirstfilter LDAP_P(( +LDAP_F( LDAPFiltInfo *) +ldap_getfirstfilter LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp, /* LDAP_CONST */ char *tagpat, /* LDAP_CONST */ char *value )); -LIBLDAP_F( LDAPFiltInfo *) -ldap_getnextfilter LDAP_P(( +LDAP_F( LDAPFiltInfo *) +ldap_getnextfilter LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp )); -LIBLDAP_F( void ) -ldap_setfilteraffixes LDAP_P(( +LDAP_F( void ) +ldap_setfilteraffixes LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp, LDAP_CONST char *prefix, LDAP_CONST char *suffix )); -LIBLDAP_F( void ) -ldap_build_filter LDAP_P(( +LDAP_F( void ) +ldap_build_filter LDAP_P(( /* deprecated */ char *buf, ber_len_t buflen, LDAP_CONST char *pattern, @@ -1430,37 +1408,37 @@ ldap_build_filter LDAP_P(( * in free.c */ -LIBLDAP_F( void * ) +LDAP_F( void * ) ldap_memalloc LDAP_P(( ber_len_t s )); -LIBLDAP_F( void * ) +LDAP_F( void * ) ldap_memrealloc LDAP_P(( void* p, ber_len_t s )); -LIBLDAP_F( void * ) +LDAP_F( void * ) ldap_memcalloc LDAP_P(( ber_len_t n, ber_len_t s )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_memfree LDAP_P(( void* p )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_memvfree LDAP_P(( void** v )); -LIBLDAP_F( char * ) +LDAP_F( char * ) ldap_strdup LDAP_P(( LDAP_CONST char * )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_getfilter_free LDAP_P(( LDAPFiltDesc *lfdp )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_mods_free LDAP_P(( LDAPMod **mods, int freemods )); @@ -1468,32 +1446,35 @@ ldap_mods_free LDAP_P(( /* * in friendly.c + * (deprecated) */ -LIBLDAP_F( char * ) -ldap_friendly_name LDAP_P(( +LDAP_F( char * ) +ldap_friendly_name LDAP_P(( /* deprecated */ LDAP_CONST char *filename, /* LDAP_CONST */ char *uname, LDAPFriendlyMap **map )); -LIBLDAP_F( void ) -ldap_free_friendlymap LDAP_P(( +LDAP_F( void ) +ldap_free_friendlymap LDAP_P(( /* deprecated */ LDAPFriendlyMap **map )); /* * in cldap.c + * (deprecated) */ -LIBLDAP_F( LDAP * ) -cldap_open LDAP_P(( +LDAP_F( LDAP * ) +cldap_open LDAP_P(( /* deprecated */ LDAP_CONST char *host, int port )); -LIBLDAP_F( void ) -cldap_close LDAP_P(( +LDAP_F( void ) +cldap_close LDAP_P(( /* deprecated */ LDAP *ld )); -LIBLDAP_F( int ) -cldap_search_s LDAP_P(( LDAP *ld, +LDAP_F( int ) +cldap_search_s LDAP_P(( /* deprecated */ + LDAP *ld, LDAP_CONST char *base, int scope, LDAP_CONST char *filter, @@ -1502,8 +1483,8 @@ cldap_search_s LDAP_P(( LDAP *ld, LDAPMessage **res, char *logdn )); -LIBLDAP_F( void ) -cldap_setretryinfo LDAP_P(( +LDAP_F( void ) +cldap_setretryinfo LDAP_P(( /* deprecated */ LDAP *ld, int tries, int timeout )); @@ -1512,19 +1493,27 @@ cldap_setretryinfo LDAP_P(( /* * in sort.c */ -LIBLDAP_F( int ) +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 )); -LIBLDAP_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 )); -LIBLDAP_F( int ) +LDAP_F( int ) /* deprecated */ ldap_sort_strcasecmp LDAP_P(( LDAP_CONST void *a, LDAP_CONST void *b )); @@ -1535,37 +1524,41 @@ ldap_sort_strcasecmp LDAP_P(( * * need _ext varients */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_is_ldap_url LDAP_P(( LDAP_CONST char *url )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_is_ldaps_url LDAP_P(( LDAP_CONST char *url )); -LIBLDAP_F( int ) +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, LDAPURLDesc **ludpp )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_free_urldesc LDAP_P(( LDAPURLDesc *ludp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_url_search LDAP_P(( LDAP *ld, LDAP_CONST char *url, int attrsonly )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_url_search_s LDAP_P(( LDAP *ld, LDAP_CONST char *url, int attrsonly, LDAPMessage **res )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_url_search_st LDAP_P(( LDAP *ld, LDAP_CONST char *url, @@ -1573,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 */ -LIBLDAP_F( void ) -ldap_set_string_translators LDAP_P(( - LDAP *ld, - BERTranslateProc encode_proc, - BERTranslateProc decode_proc )); - -LIBLDAP_F( int ) -ldap_translate_from_t61 LDAP_P(( - LDAP *ld, - char **bufp, - ber_len_t *lenp, - int free_input )); +typedef struct ldapsortkey { + char * attributeType; + char * orderingRule; + int reverseOrder; +} LDAPSortKey; + +LDAP_F( int ) +ldap_create_sort_keylist LDAP_P(( + LDAPSortKey ***sortKeyList, + char *keyString )); + +LDAP_F( void ) +ldap_free_sort_keylist LDAP_P(( + LDAPSortKey **sortkeylist )); + +LDAP_F( int ) +ldap_create_sort_control LDAP_P(( + LDAP *ld, + LDAPSortKey **keyList, + int ctl_iscritical, + LDAPControl **ctrlp )); + +LDAP_F( int ) +ldap_parse_sort_control LDAP_P(( + LDAP *ld, + LDAPControl **ctrlp, + unsigned long *result, + char **attribute )); -LIBLDAP_F( int ) -ldap_translate_to_t61 LDAP_P(( - LDAP *ld, - char **bufp, - ber_len_t *lenp, - int free_input )); -LIBLDAP_F( void ) -ldap_enable_translation LDAP_P(( - LDAP *ld, - LDAPMessage *entry, - int enable )); +/* + * in vlvctrl.c + */ -LIBLDAP_F( int ) -ldap_t61_to_8859 LDAP_P(( - char **bufp, - ber_len_t *buflenp, - int free_input )); +/* + * 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 )); -LIBLDAP_F( int ) -ldap_8859_to_t61 LDAP_P(( - char **bufp, - ber_len_t *buflenp, - int free_input )); LDAP_END_DECL - #endif /* _LDAP_H */