X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap.h;h=2d72a1e19243330f0d8e77f516ec9bf542962c79;hb=be9a50af258c16083245db489aca5676c429f606;hp=460d3811778e28d9a7311cab75ddb76ea2f921c2;hpb=1d841d49d5dc88ba0034da82be8eaf86e0c3d118;p=openldap diff --git a/include/ldap.h b/include/ldap.h index 460d381177..2d72a1e192 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -1,12 +1,13 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA + * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA * All rights reserved. * - * Redistribution and use in source and binary forms are permitted only - * as authorized by the OpenLDAP Public License. A copy of this - * license is available at http://www.OpenLDAP.org/license.html or - * in file LICENSE in the top-level directory of the distribution. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. A copy of this license is available at + * http://www.OpenLDAP.org/license.html or in file LICENSE in the + * top-level directory of the distribution. */ /* Portions * Copyright (c) 1990 Regents of the University of Michigan. @@ -26,6 +27,9 @@ /* pull in lber */ #include +/* include version and API feature defines */ +#include + LDAP_BEGIN_DECL #define LDAP_VERSION1 1 @@ -43,15 +47,11 @@ LDAP_BEGIN_DECL */ #define LDAP_API_VERSION 2004 #define LDAP_VENDOR_NAME "OpenLDAP" -/* We'll eventually release as 200 */ -#define LDAP_VENDOR_VERSION 19905 +/* We'll eventually release as 20000 */ /* OpenLDAP API Features */ #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION -/* include LDAP_API_FEATURE defines */ -#include - #if defined( LDAP_API_FEATURE_X_OPENLDAP_REENTRANT ) || \ ( defined( LDAP_THREAD_SAFE ) && \ defined( LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE ) ) @@ -122,6 +122,7 @@ LDAP_BEGIN_DECL #define LDAP_OPT_X_TLS 0x6007 #define LDAP_OPT_X_TLS_PROTOCOL 0x6008 #define LDAP_OPT_X_TLS_CIPHER_SUITE 0x6009 +#define LDAP_OPT_X_TLS_RANDOM_FILE 0x600a #define LDAP_OPT_X_TLS_NEVER 0 #define LDAP_OPT_X_TLS_HARD 1 @@ -130,14 +131,28 @@ LDAP_BEGIN_DECL #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 +#define LDAP_OPT_X_SASL_MECH 0x6100 +#define LDAP_OPT_X_SASL_REALM 0x6101 +#define LDAP_OPT_X_SASL_AUTHCID 0x6102 +#define LDAP_OPT_X_SASL_AUTHZID 0x6103 +#define LDAP_OPT_X_SASL_SSF 0x6104 /* read-only */ +#define LDAP_OPT_X_SASL_SSF_EXTERNAL 0x6105 /* write-only */ +#define LDAP_OPT_X_SASL_SECPROPS 0x6106 /* write-only */ +#define LDAP_OPT_X_SASL_SSF_MIN 0x6107 +#define LDAP_OPT_X_SASL_SSF_MAX 0x6108 +#define LDAP_OPT_X_SASL_MAXBUFSIZE 0x6109 + /* 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) @@ -172,6 +187,11 @@ typedef struct ldapcontrol { #define LDAP_CONTROL_MANAGEDSAIT "2.16.840.1.113730.3.4.2" +#define LDAP_CONTROL_DUPENT LDAP_CONTROL_DUPENT_REQUEST +#define LDAP_CONTROL_DUPENT_REQUEST "2.16.840.1.113719.1.27.101.1" +#define LDAP_CONTROL_DUPENT_RESPONSE "2.16.840.1.113719.1.27.101.2" +#define LDAP_CONTROL_DUPENT_ENTRY "2.16.840.1.113719.1.27.101.3" + /* Experimental Controls */ #define LDAP_CONTROL_SORTREQUEST "1.2.840.113556.1.4.473" @@ -186,7 +206,7 @@ typedef struct ldapcontrol { /* 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_EXOP_X_MODIFY_PASSWD "1.3.6.1.4.1.4203.1.11.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) @@ -216,8 +236,8 @@ typedef struct ldapcontrol { /* general stuff */ #define LDAP_TAG_MESSAGE ((ber_tag_t) 0x30U) /* constructed + 16 */ #define LDAP_TAG_MSGID ((ber_tag_t) 0x02U) /* integer */ -#define LDAP_TAG_LDAPDN ((ber_tag_t) 0x04U) /* octect string */ -#define LDAP_TAG_LDAPCRED ((ber_tag_t) 0x04U) /* octect string */ +#define LDAP_TAG_LDAPDN ((ber_tag_t) 0x04U) /* octet string */ +#define LDAP_TAG_LDAPCRED ((ber_tag_t) 0x04U) /* octet string */ #define LDAP_TAG_CONTROLS ((ber_tag_t) 0xa0U) /* context specific + constructed + 0 */ #define LDAP_TAG_REFERRAL ((ber_tag_t) 0xa3U) /* context specific + constructed + 3 */ @@ -238,9 +258,9 @@ typedef struct ldapcontrol { #define LDAP_REQ_MODIFY ((ber_tag_t) 0x66U) /* application + constructed */ #define LDAP_REQ_ADD ((ber_tag_t) 0x68U) /* application + constructed */ #define LDAP_REQ_DELETE ((ber_tag_t) 0x4aU) /* application + primitive */ -#define LDAP_REQ_MODRDN ((ber_tag_t) 0x6cU) /* application + constructed */ -#define LDAP_REQ_MODDN LDAP_REQ_MODRDN -#define LDAP_REQ_RENAME LDAP_REQ_MODRDN +#define LDAP_REQ_MODDN ((ber_tag_t) 0x6cU) /* application + constructed */ +#define LDAP_REQ_MODRDN LDAP_REQ_MODDN +#define LDAP_REQ_RENAME LDAP_REQ_MODDN #define LDAP_REQ_COMPARE ((ber_tag_t) 0x6eU) /* application + constructed */ #define LDAP_REQ_ABANDON ((ber_tag_t) 0x50U) /* application + primitive */ #define LDAP_REQ_EXTENDED ((ber_tag_t) 0x77U) /* application + constructed */ @@ -253,19 +273,21 @@ typedef struct ldapcontrol { #define LDAP_RES_MODIFY ((ber_tag_t) 0x67U) /* application + constructed */ #define LDAP_RES_ADD ((ber_tag_t) 0x69U) /* application + constructed */ #define LDAP_RES_DELETE ((ber_tag_t) 0x6bU) /* application + constructed */ -#define LDAP_RES_MODRDN ((ber_tag_t) 0x6dU) /* application + constructed */ -#define LDAP_RES_MODDN LDAP_RES_MODRDN /* application + constructed */ -#define LDAP_RES_RENAME LDAP_RES_MODRDN /* application + constructed */ +#define LDAP_RES_MODDN ((ber_tag_t) 0x6dU) /* application + constructed */ +#define LDAP_RES_MODRDN LDAP_RES_MODDN /* application + constructed */ +#define LDAP_RES_RENAME LDAP_RES_MODDN /* 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)) +#define LDAP_RES_ANY (-1) +#define LDAP_RES_UNSOLICITED (0) /* sasl methods */ -#define LDAP_SASL_SIMPLE NULL +#define LDAP_SASL_SIMPLE ((char*)0) +#define LDAP_SASL_NULL ("") + /* authentication methods available */ #define LDAP_AUTH_NONE ((ber_tag_t) 0x00U) /* no authentication */ @@ -300,6 +322,7 @@ typedef struct ldapcontrol { #define LDAP_SUBSTRING_FINAL ((ber_tag_t) 0x82U) /* context specific */ /* search scopes */ +#define LDAP_SCOPE_DEFAULT ((ber_int_t) -1) #define LDAP_SCOPE_BASE ((ber_int_t) 0x0000) #define LDAP_SCOPE_ONELEVEL ((ber_int_t) 0x0001) #define LDAP_SCOPE_SUBTREE ((ber_int_t) 0x0002) @@ -376,8 +399,9 @@ 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 */ +/* reserved for APIs */ #define LDAP_SERVER_DOWN 0x51 #define LDAP_LOCAL_ERROR 0x52 #define LDAP_ENCODING_ERROR 0x53 @@ -389,13 +413,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 */ +/* used but not 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,15 +520,16 @@ typedef struct ldap_friendly { * types for ldap URL handling */ typedef struct ldap_url_desc { - 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; + 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; + int lud_crit_exts; } LDAPURLDesc; #define LDAP_URL_SUCCESS 0x00 /* Success */ @@ -528,13 +554,13 @@ 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, @@ -544,7 +570,7 @@ ldap_set_option LDAP_P(( typedef int (LDAP_REBIND_PROC) LDAP_P(( LDAP *ld, LDAP_CONST char *url, int request, ber_int_t msgid )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_set_rebind_proc LDAP_P(( LDAP *ld, LDAP_REBIND_PROC *ldap_proc)); @@ -552,28 +578,35 @@ ldap_set_rebind_proc LDAP_P(( /* * in controls.c: */ -LIBLDAP_F( void ) +LDAP_F( int ) +ldap_create_control LDAP_P(( + const char *requestOID, + BerElement *ber, + int iscritical, + LDAPControl **ctrlp )); + +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 +614,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 +623,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 +633,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 +641,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(( /* deprecated */ - 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 +678,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,13 +686,13 @@ ldap_add_ext_s LDAP_P(( LDAPControl **serverctrls, LDAPControl **clientctrls )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_add LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **attrs )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_add_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, @@ -660,7 +702,7 @@ ldap_add_s LDAP_P(( /* deprecated */ /* * in sasl.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_sasl_bind LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -670,18 +712,37 @@ ldap_sasl_bind LDAP_P(( LDAPControl **clientctrls, int *msgidp )); -LIBLDAP_F( int ) -ldap_negotiated_sasl_bind_s LDAP_P(( +/* Interaction flags (should be passed about in a control) + * Automatic (default): use defaults, prompt otherwise + * Interactive: prompt always + * Quiet: never prompt + */ +#define LDAP_SASL_AUTOMATIC 0U +#define LDAP_SASL_INTERACTIVE 1U +#define LDAP_SASL_QUIET 2U + +/* + * V3 SASL Interaction Function Callback Prototype + * when using Cyrus SASL, interact is pointer to sasl_interact_t + * should likely passed in a control (and provided controls) + */ +typedef int (LDAP_SASL_INTERACT_PROC) LDAP_P(( + LDAP *ld, unsigned flags, void* defaults, void *interact )); + +LDAP_F( int ) +ldap_sasl_interactive_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 )); + LDAPControl **clientControls, + + /* should be client controls */ + unsigned flags, + LDAP_SASL_INTERACT_PROC *proc, + void *defaults )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_sasl_bind_s LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -691,7 +752,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,14 +763,14 @@ ldap_parse_sasl_bind_result LDAP_P(( * in bind.c: * (deprecated) */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_bind LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who, LDAP_CONST char *passwd, int authmethod )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_bind_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who, @@ -719,13 +780,13 @@ ldap_bind_s LDAP_P(( /* deprecated */ /* * 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, @@ -736,27 +797,27 @@ ldap_simple_bind_s LDAP_P(( * in kbind.c: * (deprecated) */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_kerberos_bind_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_kerberos_bind1 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_kerberos_bind1_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_kerberos_bind2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_kerberos_bind2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *who )); @@ -765,32 +826,32 @@ ldap_kerberos_bind2_s LDAP_P(( /* deprecated */ * 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, @@ -800,7 +861,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, @@ -809,14 +870,14 @@ ldap_compare_ext_s LDAP_P(( LDAPControl **serverctrls, LDAPControl **clientctrls )); -LIBLDAP_F( int ) +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_F( int ) ldap_compare_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, @@ -827,7 +888,7 @@ ldap_compare_s LDAP_P(( /* deprecated */ /* * in delete.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_delete_ext LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -835,19 +896,19 @@ 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_F( int ) ldap_delete LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_delete_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn )); @@ -856,7 +917,7 @@ ldap_delete_s LDAP_P(( /* deprecated */ /* * in error.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_parse_result LDAP_P(( LDAP *ld, LDAPMessage *res, @@ -867,17 +928,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 )); @@ -886,7 +947,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, @@ -895,7 +956,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, @@ -903,13 +964,13 @@ ldap_modify_ext_s LDAP_P(( LDAPControl **serverctrls, LDAPControl **clientctrls )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_modify LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAPMod **mods )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_modify_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, @@ -919,7 +980,7 @@ ldap_modify_s LDAP_P(( /* deprecated */ /* * in modrdn.c: */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_rename LDAP_P(( LDAP *ld, LDAP_CONST char *dn, @@ -930,7 +991,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, @@ -940,28 +1001,7 @@ 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_F( int ) ldap_rename2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, @@ -969,7 +1009,7 @@ ldap_rename2 LDAP_P(( /* deprecated */ LDAP_CONST char *newSuperior, int deleteoldrdn )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_rename2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, @@ -977,26 +1017,26 @@ ldap_rename2_s LDAP_P(( /* deprecated */ LDAP_CONST char *newSuperior, int deleteoldrdn )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_modrdn LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_modrdn_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_modrdn2 LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *newrdn, int deleteoldrdn )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_modrdn2_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *dn, @@ -1007,27 +1047,27 @@ ldap_modrdn2_s LDAP_P(( /* deprecated */ /* * in open.c: */ -LIBLDAP_F( LDAP *) -ldap_open LDAP_P(( /* deprecated */ +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 )); @@ -1035,17 +1075,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 )); @@ -1054,22 +1094,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, @@ -1081,22 +1121,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, @@ -1106,12 +1146,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 )); @@ -1120,53 +1160,41 @@ 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_parent_dn LDAP_P(( - LDAP_CONST char *dn )); - -LIBLDAP_F( char * ) -ldap_relative_dn LDAP_P(( - LDAP_CONST char *dn )); - -LIBLDAP_F( char * ) -ldap_normalize_dn LDAP_P(( - LDAP_CONST char *dn )); - -LIBLDAP_F( char * ) +LDAP_F( char * ) ldap_dn2dcedn LDAP_P(( LDAP_CONST char *dn )); /* deprecated */ -LIBLDAP_F( char * ) +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, @@ -1176,38 +1204,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, @@ -1215,19 +1243,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 )); @@ -1236,7 +1264,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, @@ -1250,7 +1278,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, @@ -1264,7 +1292,7 @@ ldap_search_ext_s LDAP_P(( int sizelimit, LDAPMessage **res )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_search LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, @@ -1273,7 +1301,7 @@ ldap_search LDAP_P(( /* deprecated */ char **attrs, int attrsonly )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_search_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, @@ -1283,7 +1311,7 @@ ldap_search_s LDAP_P(( /* deprecated */ int attrsonly, LDAPMessage **res )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_search_st LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *base, @@ -1294,12 +1322,12 @@ ldap_search_st LDAP_P(( /* deprecated */ struct timeval *timeout, LDAPMessage **res )); - +#ifdef LDAP_UFN /* * in ufn.c * (deprecated) */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_ufn_search_c LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, @@ -1309,7 +1337,7 @@ ldap_ufn_search_c LDAP_P(( /* deprecated */ int (*cancelproc)( void *cl ), void *cancelparm )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_ufn_search_ct LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, @@ -1322,7 +1350,7 @@ ldap_ufn_search_ct LDAP_P(( /* deprecated */ char *tag2, char *tag3 )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_ufn_search_s LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *ufn, @@ -1330,39 +1358,39 @@ ldap_ufn_search_s LDAP_P(( /* deprecated */ int attrsonly, LDAPMessage **res )); -LIBLDAP_F( LDAPFiltDesc *) +LDAP_F( LDAPFiltDesc *) ldap_ufn_setfilter LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *fname )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_ufn_setprefix LDAP_P(( /* deprecated */ LDAP *ld, LDAP_CONST char *prefix )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_ufn_timeout LDAP_P(( /* deprecated */ void *tvparam )); - +#endif /* * in unbind.c */ -LIBLDAP_F( int ) +LDAP_F( int ) ldap_unbind LDAP_P(( /* deprecated */ LDAP *ld )); -LIBLDAP_F( int ) +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, @@ -1372,32 +1400,32 @@ ldap_unbind_ext_s LDAP_P(( * in getfilter.c * (deprecated) */ -LIBLDAP_F( LDAPFiltDesc *) +LDAP_F( LDAPFiltDesc *) ldap_init_getfilter LDAP_P(( /* deprecated */ LDAP_CONST char *fname )); -LIBLDAP_F( LDAPFiltDesc *) +LDAP_F( LDAPFiltDesc *) ldap_init_getfilter_buf LDAP_P(( /* deprecated */ /* LDAP_CONST */ char *buf, ber_len_t buflen )); -LIBLDAP_F( LDAPFiltInfo *) +LDAP_F( LDAPFiltInfo *) ldap_getfirstfilter LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp, /* LDAP_CONST */ char *tagpat, /* LDAP_CONST */ char *value )); -LIBLDAP_F( LDAPFiltInfo *) +LDAP_F( LDAPFiltInfo *) ldap_getnextfilter LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_setfilteraffixes LDAP_P(( /* deprecated */ LDAPFiltDesc *lfdp, LDAP_CONST char *prefix, LDAP_CONST char *suffix )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_build_filter LDAP_P(( /* deprecated */ char *buf, ber_len_t buflen, @@ -1413,37 +1441,37 @@ ldap_build_filter LDAP_P(( /* deprecated */ * 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 )); @@ -1453,48 +1481,17 @@ ldap_mods_free LDAP_P(( * in friendly.c * (deprecated) */ -LIBLDAP_F( char * ) +LDAP_F( char * ) ldap_friendly_name LDAP_P(( /* deprecated */ LDAP_CONST char *filename, /* LDAP_CONST */ char *uname, LDAPFriendlyMap **map )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_free_friendlymap LDAP_P(( /* deprecated */ LDAPFriendlyMap **map )); -/* - * in cldap.c - * (deprecated) - */ -LIBLDAP_F( LDAP * ) -cldap_open LDAP_P(( /* deprecated */ - LDAP_CONST char *host, - int port )); - -LIBLDAP_F( void ) -cldap_close LDAP_P(( /* deprecated */ - LDAP *ld )); - -LIBLDAP_F( int ) -cldap_search_s LDAP_P(( /* deprecated */ - LDAP *ld, - LDAP_CONST char *base, - int scope, - LDAP_CONST char *filter, - char **attrs, - int attrsonly, - LDAPMessage **res, - char *logdn )); - -LIBLDAP_F( void ) -cldap_setretryinfo LDAP_P(( /* deprecated */ - LDAP *ld, - int tries, - int timeout )); - - /* * in sort.c */ @@ -1506,19 +1503,19 @@ typedef int (LDAP_SORT_AV_CMP_PROC) LDAP_P(( LDAP_CONST void *left, LDAP_CONST void *right )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_sort_entries LDAP_P(( LDAP *ld, LDAPMessage **chain, LDAP_CONST char *attr, LDAP_SORT_AD_CMP_PROC *cmp )); -LIBLDAP_F( int ) /* deprecated */ +LDAP_F( int ) /* deprecated */ ldap_sort_values LDAP_P(( LDAP *ld, char **vals, LDAP_SORT_AV_CMP_PROC *cmp )); -LIBLDAP_F( int ) /* deprecated */ +LDAP_F( int ) /* deprecated */ ldap_sort_strcasecmp LDAP_P(( LDAP_CONST void *a, LDAP_CONST void *b )); @@ -1529,41 +1526,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 )); -LIBLDAP_F( int ) +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, @@ -1583,23 +1580,23 @@ typedef struct ldapsortkey { int reverseOrder; } LDAPSortKey; -LIBLDAP_F( int ) +LDAP_F( int ) ldap_create_sort_keylist LDAP_P(( LDAPSortKey ***sortKeyList, char *keyString )); -LIBLDAP_F( void ) +LDAP_F( void ) ldap_free_sort_keylist LDAP_P(( LDAPSortKey **sortkeylist )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_create_sort_control LDAP_P(( LDAP *ld, LDAPSortKey **keyList, int ctl_iscritical, LDAPControl **ctrlp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_parse_sort_control LDAP_P(( LDAP *ld, LDAPControl **ctrlp, @@ -1625,13 +1622,13 @@ typedef struct ldapvlvinfo { void *ldvlv_extradata; } LDAPVLVInfo; -LIBLDAP_F( int ) +LDAP_F( int ) ldap_create_vlv_control LDAP_P(( LDAP *ld, LDAPVLVInfo *ldvlistp, LDAPControl **ctrlp )); -LIBLDAP_F( int ) +LDAP_F( int ) ldap_parse_vlv_control LDAP_P(( LDAP *ld, LDAPControl **ctrls,