X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap.h;h=adfd9ab2e3a90b65efadca49acc6b0cd2fff6254;hb=860470169df6b88a27c97233f7f5a32d6d4f0e67;hp=508413628becbc89ad52623c12cfc8c8aa6e1941;hpb=967d1dcb2dd35c0977118fe12e544815d5a701ed;p=openldap diff --git a/include/ldap.h b/include/ldap.h index 508413628b..adfd9ab2e3 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -1,5 +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 @@ -22,7 +23,8 @@ #ifndef _LDAP_H #define _LDAP_H -#include +/* pull in lber */ +#include LDAP_BEGIN_DECL @@ -30,19 +32,19 @@ LDAP_BEGIN_DECL #define LDAP_VERSION2 2 #define LDAP_VERSION3 3 -#define LDAP_VERSION LDAP_VERSION2 #define LDAP_VERSION_MIN LDAP_VERSION2 -#define LDAP_VERSION_MAX LDAP_VERSION2 +#define LDAP_VERSION LDAP_VERSION2 +#define LDAP_VERSION_MAX LDAP_VERSION3 /* * We'll use 2000+draft revision for our API version number * As such, the number will be above the old RFC but below * whatever number does finally get assigned */ -#define LDAP_API_VERSION 2002 +#define LDAP_API_VERSION 2004 #define LDAP_VENDOR_NAME "OpenLDAP" -/* We'll eventually release as 200 */ -#define LDAP_VENDOR_VERSION 192 +/* We'll eventually release as 20000 */ +#define LDAP_VENDOR_VERSION 19910 /* OpenLDAP API Features */ #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION @@ -63,11 +65,13 @@ LDAP_BEGIN_DECL /* #define LDAP_API_OPERATION_SESSION_SAFE 1 */ #endif -#define LDAP_PORT 389 +#define LDAP_PORT 389 /* ldap:/// default LDAP port */ +#define LDAPS_PORT 636 /* ldaps:/// default LDAP over TLS port */ #define LDAP_ROOT_DSE "" #define LDAP_NO_ATTRS "1.1" #define LDAP_ALL_USER_ATTRIBUTES "*" +#define LDAP_ALL_OPERATIONAL_ATTRIBUTES "+" /* OpenLDAP extension */ /* * LDAP_OPTions defined by draft-ldapext-ldap-c-api-02 @@ -76,7 +80,7 @@ LDAP_BEGIN_DECL * 0x4000 - 0x7fff reserved for private and experimental options */ #define LDAP_OPT_API_INFO 0x0000 -#define LDAP_OPT_DESC 0x0001 +#define LDAP_OPT_DESC 0x0001 /* deprecated */ #define LDAP_OPT_DEREF 0x0002 #define LDAP_OPT_SIZELIMIT 0x0003 #define LDAP_OPT_TIMELIMIT 0x0004 @@ -94,28 +98,65 @@ LDAP_BEGIN_DECL #define LDAP_OPT_HOST_NAME 0x0030 #define LDAP_OPT_ERROR_NUMBER 0x0031 #define LDAP_OPT_ERROR_STRING 0x0032 +#define LDAP_OPT_MATCHED_DN 0x0033 -/* 0x33 - 0x0fff not defined by current draft */ +/* 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_MATCH_STRING 0x5004 /* should have been in draft */ +#define LDAP_OPT_NETWORK_TIMEOUT 0x5005 /* socket level timeout */ +#define LDAP_OPT_URI 0x5006 + +/* OpenLDAP TLS options */ +#define LDAP_OPT_X_TLS_CACERTFILE 0x6001 +#define LDAP_OPT_X_TLS_CACERTDIR 0x6002 +#define LDAP_OPT_X_TLS_CERT 0x6003 +#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 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 +#define LDAP_OPT_X_TLS_DEMAND 2 +#define LDAP_OPT_X_TLS_ALLOW 3 +#define LDAP_OPT_X_TLS_TRY 4 + +/* OpenLDAP SASL options */ +#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) -#define LDAP_API_INFO_VERSION 1 +#define LDAP_API_INFO_VERSION (1) typedef struct ldapapiinfo { int ldapai_info_version; /* version of LDAPAPIInfo (1) */ int ldapai_api_version; /* revision of API supported */ @@ -138,15 +179,33 @@ typedef struct ldapcontrol { char ldctl_iscritical; } LDAPControl; -/* LDAP "Standard" Controls */ +/* LDAP Controls */ + /* chase referrals controls */ #define LDAP_CONTROL_REFERRALS "1.2.840.113666.1.4.616" -#define LDAP_CHASE_SUBORDINATE_REFERRALS 0x0020 -#define LDAP_CHASE_EXTERNAL_REFERRALS 0x0040 +#define LDAP_CHASE_SUBORDINATE_REFERRALS 0x0020U +#define LDAP_CHASE_EXTERNAL_REFERRALS 0x0040U -/* LDAP "Extension" Controls */ +#define LDAP_CONTROL_MANAGEDSAIT "2.16.840.1.113730.3.4.2" -/* LDAP "Private/Experiemental" Controls */ +/* Experimental Controls */ +#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.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) +#define LDAP_TAG_EXOP_X_MODIFY_PASSWD_GEN ((ber_tag_t) 0x80U) /* * specific LDAP instantiations of BER types we know about @@ -170,168 +229,108 @@ typedef struct ldapcontrol { */ /* general stuff */ -#define LDAP_TAG_MESSAGE 0x30UL /* constructed + 16 */ -#define OLD_LDAP_TAG_MESSAGE 0x10UL /* forgot the constructed bit */ -#define LDAP_TAG_MSGID 0x02UL /* integer */ -#define LDAP_TAG_LDAPDN 0x04UL /* octect string */ -#define LDAP_TAG_CONTROLS 0xa0UL /* context specific + constructed + 0 */ -#define LDAP_TAG_REFERRAL 0xa3UL /* context specific + constructed + 3 */ -#define LDAP_TAG_NEWSUPERIOR 0x80UL /* context-specific + primitive + 0 */ +#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_CONTROLS ((ber_tag_t) 0xa0U) /* context specific + constructed + 0 */ +#define LDAP_TAG_REFERRAL ((ber_tag_t) 0xa3U) /* context specific + constructed + 3 */ -#define LDAP_TAG_SASL_RES_CREDS 0x87UL /* context specific + primitive */ +#define LDAP_TAG_NEWSUPERIOR ((ber_tag_t) 0x80U) /* context-specific + primitive + 0 */ -/* possible operations a client can invoke */ -#define LDAP_REQ_BIND 0x60UL /* application + constructed */ -#define LDAP_REQ_UNBIND 0x42UL /* application + primitive */ -#define LDAP_REQ_SEARCH 0x63UL /* application + constructed */ -#define LDAP_REQ_MODIFY 0x66UL /* application + constructed */ -#define LDAP_REQ_ADD 0x68UL /* application + constructed */ -#define LDAP_REQ_DELETE 0x4aUL /* application + primitive */ -#define LDAP_REQ_MODRDN 0x6cUL /* application + constructed */ -#define LDAP_REQ_MODDN LDAP_REQ_MODRDN -#define LDAP_REQ_RENAME LDAP_REQ_MODRDN -#define LDAP_REQ_COMPARE 0x6eUL /* application + constructed */ -#define LDAP_REQ_ABANDON 0x50UL /* application + primitive */ -#define LDAP_REQ_EXTENDED 0x77UL /* application + constructed */ - -/* U-Mich version 3.0 compatibility stuff */ -#define LDAP_REQ_UNBIND_30 0x62UL -#define LDAP_REQ_DELETE_30 0x6aUL -#define LDAP_REQ_ABANDON_30 0x70UL +#define LDAP_TAG_EXOP_REQ_OID ((ber_tag_t) 0x80U) /* context specific + primitive */ +#define LDAP_TAG_EXOP_REQ_VALUE ((ber_tag_t) 0x81U) /* context specific + primitive */ +#define LDAP_TAG_EXOP_RES_OID ((ber_tag_t) 0x8aU) /* context specific + primitive */ +#define LDAP_TAG_EXOP_RES_VALUE ((ber_tag_t) 0x8bU) /* context specific + primitive */ -/* - * old broken stuff for backwards compatibility - forgot application tag - * and constructed/primitive bit - */ -#define OLD_LDAP_REQ_BIND 0x00UL -#define OLD_LDAP_REQ_UNBIND 0x02UL -#define OLD_LDAP_REQ_SEARCH 0x03UL -#define OLD_LDAP_REQ_MODIFY 0x06UL -#define OLD_LDAP_REQ_ADD 0x08UL -#define OLD_LDAP_REQ_DELETE 0x0aUL -#define OLD_LDAP_REQ_MODRDN 0x0cUL -#define OLD_LDAP_REQ_COMPARE 0x0eUL -#define OLD_LDAP_REQ_ABANDON 0x10UL +#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 */ +#define LDAP_REQ_SEARCH ((ber_tag_t) 0x63U) /* application + constructed */ +#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_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 */ /* possible result types a server can return */ -#define LDAP_RES_BIND 0x61UL /* application + constructed */ -#define LDAP_RES_SEARCH_ENTRY 0x64UL /* application + constructed */ -#define LDAP_RES_SEARCH_REFERENCE 0x73UL /* V3: application + constructed */ -#define LDAP_RES_SEARCH_RESULT 0x65UL /* application + constructed */ -#define LDAP_RES_MODIFY 0x67UL /* application + constructed */ -#define LDAP_RES_ADD 0x69UL /* application + constructed */ -#define LDAP_RES_DELETE 0x6bUL /* application + constructed */ -#define LDAP_RES_MODRDN 0x6dUL /* application + constructed */ -#define LDAP_RES_MODDN LDAP_RES_MODRDN /* application + constructed */ -#define LDAP_RES_RENAME LDAP_RES_MODRDN /* application + constructed */ -#define LDAP_RES_COMPARE 0x6fUL /* application + constructed */ -#define LDAP_RES_EXTENDED 0x78UL /* V3: application + constructed */ -#define LDAP_RES_ANY ((unsigned long)(-1)) - -/* old broken stuff for backwards compatibility */ -#define OLD_LDAP_RES_BIND 0x01UL -#define OLD_LDAP_RES_SEARCH_ENTRY 0x04UL -#define OLD_LDAP_RES_SEARCH_RESULT 0x05UL -#define OLD_LDAP_RES_MODIFY 0x07UL -#define OLD_LDAP_RES_ADD 0x09UL -#define OLD_LDAP_RES_DELETE 0x0bUL -#define OLD_LDAP_RES_MODRDN 0x0dUL -#define OLD_LDAP_RES_MODDN OLD_LDAP_RES_MODRDN -#define OLD_LDAP_RES_COMPARE 0x0fUL +#define LDAP_RES_BIND ((ber_tag_t) 0x61U) /* application + constructed */ +#define LDAP_RES_SEARCH_ENTRY ((ber_tag_t) 0x64U) /* application + constructed */ +#define LDAP_RES_SEARCH_REFERENCE ((ber_tag_t) 0x73U) /* V3: application + constructed */ +#define LDAP_RES_SEARCH_RESULT ((ber_tag_t) 0x65U) /* application + constructed */ +#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_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 (-1) +#define LDAP_RES_UNSOLICITED (0) + /* sasl methods */ -#define LDAP_SASL_SIMPLE NULL +#define LDAP_SASL_SIMPLE ((char*)0) + /* authentication methods available */ -#define LDAP_AUTH_NONE 0x00UL /* no authentication */ -#define LDAP_AUTH_SIMPLE 0x80UL /* context specific + primitive */ -#define LDAP_AUTH_SASL 0xa3UL /* context specific + primitive */ -#define LDAP_AUTH_KRBV4 0xffUL /* means do both of the following */ -#define LDAP_AUTH_KRBV41 0x81UL /* context specific + primitive */ -#define LDAP_AUTH_KRBV42 0x82UL /* context specific + primitive */ - -/* U-Mich version 3.0 compatibility auth methods */ -#define LDAP_AUTH_SIMPLE_30 0xa0UL /* context specific + constructed */ -#define LDAP_AUTH_KRBV41_30 0xa1UL /* context specific + constructed */ -#define LDAP_AUTH_KRBV42_30 0xa2UL /* context specific + constructed */ - -/* old broken stuff */ -#define OLD_LDAP_AUTH_SIMPLE 0x00UL -#define OLD_LDAP_AUTH_KRBV4 0x01UL -#define OLD_LDAP_AUTH_KRBV42 0x02UL +#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_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 */ + /* filter types */ -#define LDAP_FILTER_AND 0xa0UL /* context specific + constructed */ -#define LDAP_FILTER_OR 0xa1UL /* context specific + constructed */ -#define LDAP_FILTER_NOT 0xa2UL /* context specific + constructed */ -#define LDAP_FILTER_EQUALITY 0xa3UL /* context specific + constructed */ -#define LDAP_FILTER_SUBSTRINGS 0xa4UL /* context specific + constructed */ -#define LDAP_FILTER_GE 0xa5UL /* context specific + constructed */ -#define LDAP_FILTER_LE 0xa6UL /* context specific + constructed */ -#define LDAP_FILTER_PRESENT 0x87UL /* context specific + primitive */ -#define LDAP_FILTER_APPROX 0xa8UL /* context specific + constructed */ -#define LDAP_FILTER_EXTENDED 0xa9UL /* context specific + constructed */ - -/* U-Mich version 3.0 compatibility filter types */ -#define LDAP_FILTER_PRESENT_30 0xa7UL /* context specific + constructed */ - -/* old broken stuff */ -#define OLD_LDAP_FILTER_AND 0x00UL -#define OLD_LDAP_FILTER_OR 0x01UL -#define OLD_LDAP_FILTER_NOT 0x02UL -#define OLD_LDAP_FILTER_EQUALITY 0x03UL -#define OLD_LDAP_FILTER_SUBSTRINGS 0x04UL -#define OLD_LDAP_FILTER_GE 0x05UL -#define OLD_LDAP_FILTER_LE 0x06UL -#define OLD_LDAP_FILTER_PRESENT 0x07UL -#define OLD_LDAP_FILTER_APPROX 0x08UL +#define LDAP_FILTER_AND ((ber_tag_t) 0xa0U) /* context specific + constructed */ +#define LDAP_FILTER_OR ((ber_tag_t) 0xa1U) /* context specific + constructed */ +#define LDAP_FILTER_NOT ((ber_tag_t) 0xa2U) /* context specific + constructed */ +#define LDAP_FILTER_EQUALITY ((ber_tag_t) 0xa3U) /* context specific + constructed */ +#define LDAP_FILTER_SUBSTRINGS ((ber_tag_t) 0xa4U) /* context specific + constructed */ +#define LDAP_FILTER_GE ((ber_tag_t) 0xa5U) /* context specific + constructed */ +#define LDAP_FILTER_LE ((ber_tag_t) 0xa6U) /* context specific + constructed */ +#define LDAP_FILTER_PRESENT ((ber_tag_t) 0x87U) /* context specific + primitive */ +#define LDAP_FILTER_APPROX ((ber_tag_t) 0xa8U) /* context specific + constructed */ +#define LDAP_FILTER_EXT ((ber_tag_t) 0xa9U) /* context specific + constructed */ /* extended filter component types */ -#define LDAP_FILTER_EXTENDED_OID 0x81UL /* context specific */ -#define LDAP_FILTER_EXTENDED_TYPE 0x82UL /* context specific */ -#define LDAP_FILTER_EXTENDED_VALUE 0x83UL /* context specific */ -#define LDAP_FILTER_EXTENDED_DNATTRS 0x84UL /* context specific */ +#define LDAP_FILTER_EXT_OID ((ber_tag_t) 0x81U) /* context specific */ +#define LDAP_FILTER_EXT_TYPE ((ber_tag_t) 0x82U) /* context specific */ +#define LDAP_FILTER_EXT_VALUE ((ber_tag_t) 0x83U) /* context specific */ +#define LDAP_FILTER_EXT_DNATTRS ((ber_tag_t) 0x84U) /* context specific */ /* substring filter component types */ -#define LDAP_SUBSTRING_INITIAL 0x80UL /* context specific */ -#define LDAP_SUBSTRING_ANY 0x81UL /* context specific */ -#define LDAP_SUBSTRING_FINAL 0x82UL /* context specific */ - -/* U-Mich version 3.0 compatibility substring filter component types */ -#define LDAP_SUBSTRING_INITIAL_30 0xa0UL /* context specific */ -#define LDAP_SUBSTRING_ANY_30 0xa1UL /* context specific */ -#define LDAP_SUBSTRING_FINAL_30 0xa2UL /* context specific */ - -/* old broken stuff */ -#define OLD_LDAP_SUBSTRING_INITIAL 0x00UL -#define OLD_LDAP_SUBSTRING_ANY 0x01UL -#define OLD_LDAP_SUBSTRING_FINAL 0x02UL +#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 */ /* search scopes */ -#define LDAP_SCOPE_BASE 0x0000 -#define LDAP_SCOPE_ONELEVEL 0x0001 -#define LDAP_SCOPE_SUBTREE 0x0002 +#define LDAP_SCOPE_BASE ((ber_int_t) 0x0000) +#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 0x0000 -#define LDAP_MOD_DELETE 0x0001 -#define LDAP_MOD_REPLACE 0x0002 -#define LDAP_MOD_BVALUES 0x0080 - 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 */ +#define LDAP_RANGE(n,x,y) (((x) <= (n)) && ((n) <= (y))) + #define LDAP_SUCCESS 0x00 #define LDAP_OPERATIONS_ERROR 0x01 #define LDAP_PROTOCOL_ERROR 0x02 @@ -339,17 +338,19 @@ typedef struct ldapmod { #define LDAP_SIZELIMIT_EXCEEDED 0x04 #define LDAP_COMPARE_FALSE 0x05 #define LDAP_COMPARE_TRUE 0x06 -#define LDAP_STRONG_AUTH_NOT_SUPPORTED 0x07 -#define LDAP_AUTH_METHOD_NOT_SUPPORTED LDAP_STRONG_AUTH_NOT_SUPPORTED +#define LDAP_AUTH_METHOD_NOT_SUPPORTED 0x07 +#define LDAP_STRONG_AUTH_NOT_SUPPORTED LDAP_AUTH_METHOD_NOT_SUPPORTED #define LDAP_STRONG_AUTH_REQUIRED 0x08 #define LDAP_PARTIAL_RESULTS 0x09 /* not listed in v3 */ #define LDAP_REFERRAL 0x0a /* LDAPv3 */ #define LDAP_ADMINLIMIT_EXCEEDED 0x0b /* LDAPv3 */ -#define LDAP_UNAVAILABLE_CRITICIAL_EXTENSION 0x0c /* LDAPv3 */ +#define LDAP_UNAVAILABLE_CRITICAL_EXTENSION 0x0c /* LDAPv3 */ #define LDAP_CONFIDENTIALITY_REQUIRED 0x0d /* LDAPv3 */ #define LDAP_SASL_BIND_IN_PROGRESS 0x0e /* LDAPv3 */ +#define LDAP_ATTR_ERROR(n) LDAP_RANGE((n),0x10,0x15) /* 16-21 */ + #define LDAP_NO_SUCH_ATTRIBUTE 0x10 #define LDAP_UNDEFINED_TYPE 0x11 #define LDAP_INAPPROPRIATE_MATCHING 0x12 @@ -357,22 +358,29 @@ typedef struct ldapmod { #define LDAP_TYPE_OR_VALUE_EXISTS 0x14 #define LDAP_INVALID_SYNTAX 0x15 +#define LDAP_NAME_ERROR(n) LDAP_RANGE((n),0x20,0x24) /* 32-34,36 */ + #define LDAP_NO_SUCH_OBJECT 0x20 #define LDAP_ALIAS_PROBLEM 0x21 #define LDAP_INVALID_DN_SYNTAX 0x22 #define LDAP_IS_LEAF 0x23 /* not LDAPv3 */ #define LDAP_ALIAS_DEREF_PROBLEM 0x24 -#define LDAP_NAME_ERROR(n) (((int)(n) & 0x00f0) == 0x0020) +#define LDAP_SECURITY_ERROR(n) LDAP_RANGE((n),0x30,0x32) /* 48-50 */ #define LDAP_INAPPROPRIATE_AUTH 0x30 #define LDAP_INVALID_CREDENTIALS 0x31 #define LDAP_INSUFFICIENT_ACCESS 0x32 + +#define LDAP_SERVICE_ERROR(n) LDAP_RANGE((n),0x33,0x36) /* 51-54 */ + #define LDAP_BUSY 0x33 #define LDAP_UNAVAILABLE 0x34 #define LDAP_UNWILLING_TO_PERFORM 0x35 #define LDAP_LOOP_DETECT 0x36 +#define LDAP_UPDATE_ERROR(n) LDAP_RANGE((n),0x40,0x47) /* 64-69,71 */ + #define LDAP_NAMING_VIOLATION 0x40 #define LDAP_OBJECT_CLASS_VIOLATION 0x41 #define LDAP_NOT_ALLOWED_ON_NONLEAF 0x42 @@ -383,6 +391,9 @@ typedef struct ldapmod { #define LDAP_AFFECTS_MULTIPLE_DSAS 0x47 /* LDAPv3 */ #define LDAP_OTHER 0x50 + +#define LDAP_API_ERROR(n) LDAP_RANGE((n),0x51,0x61) /* 81-97 */ + #define LDAP_SERVER_DOWN 0x51 #define LDAP_LOCAL_ERROR 0x52 #define LDAP_ENCODING_ERROR 0x53 @@ -394,13 +405,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. @@ -410,6 +422,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 */ @@ -417,8 +451,8 @@ typedef struct ldapmsg LDAPMessage; typedef struct ldap_filt_info { char *lfi_filter; char *lfi_desc; - int lfi_scope; /* LDAP_SCOPE_BASE, etc */ - int lfi_isexact; /* exact match filter? */ + int lfi_scope; + int lfi_isexact; struct ldap_filt_info *lfi_next; } LDAPFiltInfo; @@ -447,9 +481,10 @@ typedef struct ldap_filt_desc { /* - * structure representing an ldap connection + * structure representing an ldap session which can + * encompass connections to multiple servers (in the + * face of referrals). */ - typedef struct ldap LDAP; #define LDAP_DEREF_NEVER 0x00 @@ -477,23 +512,33 @@ 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_string; /* for internal use only */ + char **lud_exts; } LDAPURLDesc; -#define LDAP_URL_ERR_NOTLDAP 0x01 /* URL doesn't begin with "ldap://" */ -#define LDAP_URL_ERR_NODN 0x02 /* URL has no DN (required) */ -#define LDAP_URL_ERR_BADSCOPE 0x03 /* URL scope string is invalid */ -#define LDAP_URL_ERR_MEM 0x04 /* can't allocate memory space */ +#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_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 */ +#define LDAP_URL_ERR_BADATTRS 0x07 /* bad (or missing) attributes */ +#define LDAP_URL_ERR_BADSCOPE 0x08 /* scope string is invalid (or missing) */ +#define LDAP_URL_ERR_BADFILTER 0x09 /* bad or missing filter */ +#define LDAP_URL_ERR_BADEXTS 0x0a /* bad or missing extensions */ /* * The API draft spec says we should declare (or cause to be declared) - * 'struct timeval'. We don't. See LDAPext discussions. + * 'struct timeval'. We don't. See IETF LDAPext discussions. */ struct timeval; @@ -512,10 +557,25 @@ 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: */ +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 )); @@ -524,15 +584,32 @@ 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: */ LDAP_F( int ) ldap_extended_operation LDAP_P(( LDAP *ld, - LDAP_CONST char *exoid, - struct berval *exdata, + LDAP_CONST char *reqoid, + struct berval *reqdata, LDAPControl **serverctrls, LDAPControl **clientctrls, int *msgidp )); @@ -540,8 +617,8 @@ ldap_extended_operation LDAP_P(( LDAP_F( int ) ldap_extended_operation_s LDAP_P(( LDAP *ld, - LDAP_CONST char *exoid, - struct berval *exdata, + LDAP_CONST char *reqoid, + struct berval *reqdata, LDAPControl **serverctrls, LDAPControl **clientctrls, char **retoidp, @@ -555,21 +632,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: @@ -592,20 +678,20 @@ 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 )); /* - * in saslbind.c: + * in sasl.c: */ LDAP_F( int ) ldap_sasl_bind LDAP_P(( @@ -615,7 +701,37 @@ ldap_sasl_bind LDAP_P(( struct berval *cred, LDAPControl **serverctrls, LDAPControl **clientctrls, - int msgidp )); + int *msgidp )); + +/* 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 *saslMechanism, + LDAPControl **serverControls, + LDAPControl **clientControls, + + /* should be client controls */ + unsigned flags, + LDAP_SASL_INTERACT_PROC *proc, + void *defaults )); LDAP_F( int ) ldap_sasl_bind_s LDAP_P(( @@ -639,30 +755,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: */ @@ -684,27 +789,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 )); @@ -713,7 +818,7 @@ ldap_kerberos_bind2_s LDAP_P(( * (deprecated) */ LDAP_F( int ) -ldap_enable_cache LDAP_P(( LDAP *ld, long timeout, long maxmem )); +ldap_enable_cache LDAP_P(( LDAP *ld, long timeout, ber_len_t maxmem )); LDAP_F( void ) ldap_disable_cache LDAP_P(( LDAP *ld )); @@ -757,14 +862,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, @@ -790,12 +895,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 )); @@ -804,15 +909,26 @@ ldap_delete_s LDAP_P(( * in error.c: */ LDAP_F( int ) -ldap_result2error LDAP_P(( /* deprecated */ - LDAP *ld, - LDAPMessage *r, - int freeit )); +ldap_parse_result LDAP_P(( + LDAP *ld, + LDAPMessage *res, + int *errcodep, + char **matcheddnp, + char **errmsgp, + char ***referralsp, + LDAPControl ***serverctrls, + int freeit )); LDAP_F( char *) ldap_err2string LDAP_P(( int err )); +LDAP_F( int ) +ldap_result2error LDAP_P(( /* deprecated */ + LDAP *ld, + LDAPMessage *r, + int freeit )); + LDAP_F( void ) ldap_perror LDAP_P(( /* deprecated */ LDAP *ld, @@ -840,13 +956,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 )); @@ -856,63 +972,63 @@ ldap_modify_s LDAP_P(( * in modrdn.c: */ 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_rename LDAP_P(( + LDAP *ld, + LDAP_CONST char *dn, + LDAP_CONST char *newrdn, + LDAP_CONST char *newSuperior, + int deleteoldrdn, + LDAPControl **sctrls, + LDAPControl **cctrls, + 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_rename_s LDAP_P(( + LDAP *ld, + LDAP_CONST char *dn, + LDAP_CONST char *newrdn, + LDAP_CONST char *newSuperior, + int deleteoldrdn, + LDAPControl **sctrls, + LDAPControl **cctrls )); 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, @@ -923,15 +1039,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: @@ -1021,45 +1151,30 @@ ldap_add_result_entry LDAP_P(( /* * in getdn.c */ -LDAP_F( char *) +LDAP_F( char * ) ldap_get_dn LDAP_P(( LDAP *ld, LDAPMessage *entry )); -LDAP_F( char *) +LDAP_F( char * ) ldap_dn2ufn LDAP_P(( LDAP_CONST char *dn )); -LDAP_F( char **) +LDAP_F( char ** ) ldap_explode_dn LDAP_P(( LDAP_CONST char *dn, int notypes )); -LDAP_F( char **) +LDAP_F( char ** ) ldap_explode_rdn LDAP_P(( LDAP_CONST char *rdn, int notypes )); -LDAP_F( char *) -ldap_parent_dn LDAP_P(( /* new (from slapd) */ - LDAP_CONST char *dn )); - -LDAP_F( char *) -ldap_relative_dn LDAP_P(( /* new (from slapd) */ - LDAP_CONST char *dn )); - -LDAP_F( char *) -ldap_normalize_dn LDAP_P(( /* new (from slapd) */ - 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 @@ -1119,17 +1234,6 @@ ldap_result LDAP_P(( struct timeval *timeout, LDAPMessage **result )); -LDAP_F( int ) -ldap_parse_result LDAP_P(( - LDAP *ld, - LDAPMessage *res, - int *errcodep, - char **matcheddnp, - char **errmsgp, - char ***referralsp, - LDAPControl ***serverctrls, - int freeit )); - LDAP_F( int ) ldap_msgtype LDAP_P(( LDAPMessage *lm )); @@ -1180,7 +1284,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, @@ -1189,7 +1293,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, @@ -1199,7 +1303,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, @@ -1211,10 +1315,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, @@ -1224,7 +1329,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, @@ -1237,7 +1342,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, @@ -1245,17 +1350,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 )); @@ -1263,11 +1368,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 ) @@ -1284,36 +1389,37 @@ 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, - long buflen )); + 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, - unsigned long buflen, + ber_len_t buflen, LDAP_CONST char *pattern, LDAP_CONST char *prefix, LDAP_CONST char *suffix, @@ -1326,9 +1432,31 @@ ldap_build_filter LDAP_P(( * in free.c */ +LDAP_F( void * ) +ldap_memalloc LDAP_P(( + ber_len_t s )); + +LDAP_F( void * ) +ldap_memrealloc LDAP_P(( + void* p, + ber_len_t s )); + +LDAP_F( void * ) +ldap_memcalloc LDAP_P(( + ber_len_t n, + ber_len_t s )); + LDAP_F( void ) ldap_memfree LDAP_P(( - void *p )); + void* p )); + +LDAP_F( void ) +ldap_memvfree LDAP_P(( + void** v )); + +LDAP_F( char * ) +ldap_strdup LDAP_P(( + LDAP_CONST char * )); LDAP_F( void ) ldap_getfilter_free LDAP_P(( @@ -1342,63 +1470,43 @@ 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 + * in sort.c */ -LDAP_F( LDAP * ) -cldap_open LDAP_P(( - LDAP_CONST char *host, - int port )); +typedef int (LDAP_SORT_AD_CMP_PROC) LDAP_P(( + LDAP_CONST char *left, + LDAP_CONST char *right )); -LDAP_F( void ) -cldap_close LDAP_P(( - LDAP *ld )); +typedef int (LDAP_SORT_AV_CMP_PROC) LDAP_P(( + LDAP_CONST void *left, + LDAP_CONST void *right )); LDAP_F( int ) -cldap_search_s LDAP_P(( LDAP *ld, - LDAP_CONST char *base, - int scope, - LDAP_CONST char *filter, - char **attrs, - int attrsonly, - LDAPMessage **res, - char *logdn )); - -LDAP_F( void ) -cldap_setretryinfo LDAP_P(( - LDAP *ld, - int tries, - int timeout )); - - -/* - * in sort.c - */ -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 )); @@ -1413,6 +1521,14 @@ LDAP_F( int ) ldap_is_ldap_url LDAP_P(( LDAP_CONST char *url )); +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, @@ -1443,48 +1559,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, - unsigned long *lenp, - int free_input )); - -LDAP_F( int ) -ldap_translate_to_t61 LDAP_P(( - LDAP *ld, - char **bufp, - unsigned long *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, - unsigned long *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, - unsigned long *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 */