#include <ac/unistd.h>
#include "slap.h"
+
+#ifdef LDAP_SLAPI
#include "slapi.h"
+#endif
static char *v2ref( BerVarray ref, const char *text )
{
}
#ifdef LDAP_CONNECTIONLESS
- if (conn->c_is_udp && conn->c_protocol == LDAP_VERSION2) {
+ if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
rc = ber_printf( ber, "t{ess" /*"}}"*/,
tag, err,
matched == NULL ? "" : matched,
rc = ber_printf( ber, /*"{"*/ "N}" );
}
+#ifdef LDAP_CONNECTIONLESS
+ if( conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1 ) {
+ rc = ber_printf( ber, /*"{"*/ "N}" );
+ }
+#endif
+
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
assert( err != LDAP_PARTIAL_RESULTS );
if ( err == LDAP_REFERRAL ) {
-#ifdef LDAP_CONTROL_NOREFERRALS
- if( op->o_noreferrals ) {
+#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+ if( op->o_domain_scope ) {
ref = NULL;
}
#endif
ber_init_w_nullc( ber, LBER_USE_DER );
#ifdef LDAP_CONNECTIONLESS
- if (conn->c_is_udp && conn->c_protocol == LDAP_VERSION2) {
- rc = ber_printf(ber, "t{0{" /*}}*/,
+ if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
+ rc = ber_printf(ber, "t{O{" /*}}*/,
LDAP_RES_SEARCH_ENTRY, &e->e_name);
} else
#endif
rc = send_ldap_controls( ber, ctrls );
}
+#ifdef LDAP_CONNECTIONLESS
+ if( conn->c_is_udp && op->o_protocol == LDAP_VERSION2 ) {
+ ; /* empty, skip following if */
+ } else
+#endif
if( rc != -1 ) {
rc = ber_printf( ber, /*{*/ "N}" );
}
return( 1 );
}
-#ifdef LDAP_CONTROL_NOREFERRALS
- if( op->o_noreferrals ) {
+#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+ if( op->o_domain_scope ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
- "send_search_reference: conn %lu noreferrals control in (%s).\n",
+ "send_search_reference: conn %lu domainScope control in (%s).\n",
op->o_connid, e->e_dn, 0 );
#else
Debug( LDAP_DEBUG_ANY,
- "send_search_reference: noreferrals control in (%s)\n",
+ "send_search_reference: domainScope control in (%s)\n",
e->e_dn, 0, 0 );
#endif