#define LDAP_OPT_X_SASL_MAXBUFSIZE 0x6109
/* on/off values */
-#define LDAP_OPT_ON ((void *) 1)
+#define LDAP_OPT_ON ((void *) &ber_pvt_opt_on)
#define LDAP_OPT_OFF ((void *) 0)
/*
#define LDAP_CONTROL_DUPENT LDAP_CONTROL_DUPENT_REQUEST
#endif
-#ifdef LDAP_DEVEL
#define LDAP_CONTROL_PAGEDRESULTS "1.2.840.113556.1.4.319"
-#endif
-
-#ifdef LDAP_DEVEL
-#define LDAP_CLIENT_UPDATE 1
-#define LDAP_SYNC 2
-#endif
#ifdef LDAP_CLIENT_UPDATE
#define LDAP_CONTROL_CLIENT_UPDATE "1.3.6.1.4.1.4203.666.5.3"
#define LDAP_CUP_COOKIE_OID "1.3.6.1.4.1.4203.666.10.1"
#endif
+#define LDAP_SYNC 2
#ifdef LDAP_SYNC
+#define LDAP_SYNCREPL 1
#define LDAP_CONTROL_SYNC "1.3.6.1.4.1.4203.666.5.6"
#define LDAP_CONTROL_SYNC_STATE "1.3.6.1.4.1.4203.666.5.7"
#define LDAP_CONTROL_SYNC_DONE "1.3.6.1.4.1.4203.666.5.8"
#define LDAP_CONTROL_VLVREQUEST "2.16.840.1.113730.3.4.9"
#define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10"
-#ifdef LDAP_DEVEL
+/* controls for MSAD compatibility */
#define LDAP_CONTROL_X_DOMAIN_SCOPE "1.2.840.113556.1.4.1339"
#define LDAP_CONTROL_X_PERMISSIVE_MODIFY "1.2.840.113556.1.4.1413"
-#endif
/* LDAP Unsolicited Notifications */
#define LDAP_NOTICE_OF_DISCONNECTION "1.3.6.1.4.1.1466.20036"
#define LDAP_TAG_EXOP_MODIFY_PASSWD_GEN ((ber_tag_t) 0x80U)
#define LDAP_EXOP_X_WHO_AM_I "1.3.6.1.4.1.4203.1.11.3"
-
-#ifdef LDAP_DEVEL
#define LDAP_EXOP_X_CANCEL "1.3.6.1.4.1.4203.666.6.3"
-#endif
/* LDAP Features */
#define LDAP_FEATURE_ALL_OPERATIONAL_ATTRS "1.3.6.1.4.1.4203.1.5.1" /* + */
#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 */
-#ifdef LDAP_DEVEL
-#define LDAP_RES_INTERMEDIATE_RESP ((ber_tag_t) 0x7aU)
-#endif
+#define LDAP_RES_INTERMEDIATE ((ber_tag_t) 0x79U) /* V3+: application + constructed */
#define LDAP_RES_ANY (-1)
#define LDAP_RES_UNSOLICITED (0)
int freeit ));
LDAP_F( int )
-ldap_parse_extended_partial LDAP_P((
+ldap_parse_intermediate LDAP_P((
LDAP *ld,
LDAPMessage *res,
char **retoidp,
LDAPControl ***serverctrls,
int freeit ));
-LDAP_F( int )
-ldap_parse_intermediate_resp_result LDAP_P((
- LDAP *ld,
- LDAPMessage *res,
- char **retoidp,
- struct berval **retdatap,
- int freeit ));
-
/*
* in abandon.c:
*/
LDAP *ld,
LDAPMessage *chain ));
-
/*
* in references.c:
*/
#define LDAP_DN_PEDANTIC 0xF000U
LDAP_F( void ) ldap_rdnfree LDAP_P(( LDAPRDN rdn ));
-LDAP_F( void ) ldap_rdnfree_x LDAP_P(( LDAPRDN rdn, void *ctx ));
LDAP_F( void ) ldap_dnfree LDAP_P(( LDAPDN dn ));
-LDAP_F( void ) ldap_dnfree_x LDAP_P(( LDAPDN dn, void *ctx ));
LDAP_F( int )
ldap_bv2dn LDAP_P((
LDAPDN *dn,
unsigned flags ));
-LDAP_F( int )
-ldap_bv2dn_x LDAP_P((
- struct berval *bv, LDAPDN *dn, unsigned flags, void *ctx ));
-
LDAP_F( int )
ldap_str2dn LDAP_P((
LDAP_CONST char *str,
struct berval *bv,
unsigned flags ));
-LDAP_F( int )
-ldap_dn2bv_x LDAP_P((
- LDAPDN dn, struct berval *bv, unsigned flags, void *ctx ));
-
LDAP_F( int )
ldap_dn2str LDAP_P((
LDAPDN dn,
char **next,
unsigned flags ));
-LDAP_F( int )
-ldap_bv2rdn_x LDAP_P((
- struct berval *bv, LDAPRDN *rdn, char **next,
- unsigned flags, void *ctx ));
-
LDAP_F( int )
ldap_str2rdn LDAP_P((
LDAP_CONST char *str,
struct berval *bv,
unsigned flags ));
-LDAP_F( int )
-ldap_rdn2bv_x LDAP_P((
- LDAPRDN rdn, struct berval *bv, unsigned flags, void *ctx ));
-
LDAP_F( int )
ldap_rdn2str LDAP_P((
LDAPRDN rdn,