/* result.c - routines to send ldap results, errors, and referrals */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "slap.h"
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
static char *v2ref( BerVarray ref, const char *text )
{
size_t len = 0, i = 0;
}
}
- v2 = ch_malloc( len+i+sizeof("Referral:") );
+ v2 = SLAP_MALLOC( len+i+sizeof("Referral:") );
+ if( v2 == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
+#endif
+ return NULL;
+ }
+
if( text != NULL ) {
strcpy(v2, text);
if( i ) {
len += sizeof("Referral:");
for( i=0; ref[i].bv_val != NULL; i++ ) {
- v2 = ch_realloc( v2, len + ref[i].bv_len + 1 );
+ v2 = SLAP_REALLOC( v2, len + ref[i].bv_len + 1 );
+ if( v2 == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
+#endif
+ return NULL;
+ }
v2[len-1] = '\n';
AC_MEMCPY(&v2[len], ref[i].bv_val, ref[i].bv_len );
len += ref[i].bv_len;
LDAPControl **ctrls
)
{
- char berbuf[256];
+ char berbuf[LBER_ELEMENT_SIZEOF];
BerElement *ber = (BerElement *)berbuf;
int rc;
long bytes;
return;
}
- assert( ctrls == NULL ); /* ctrls not implemented */
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp)
+ ber = op->o_res_ber;
+ else
+#endif
ber_init_w_nullc( ber, LBER_USE_DER );
}
#ifdef LDAP_CONNECTIONLESS
- if (conn->c_is_udp) {
- rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
- if (rc != sizeof(struct sockaddr)) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "send_ldap_response: conn %lu ber_write failed\n",
- conn ? conn->c_connid : 0 , 0, 0);
-#else
- Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
-#endif
- ber_free_buf( ber );
- return;
- }
- }
if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
- rc = ber_printf( ber, "{is{t{ess" /*"}}}"*/,
- msgid, "", tag, err,
+ rc = ber_printf( ber, "t{ess" /*"}}"*/,
+ tag, err,
matched == NULL ? "" : matched,
text == NULL ? "" : text );
- } else
+ } else
#endif
{
rc = ber_printf( ber, "{it{ess" /*"}}"*/,
rc = ber_printf( ber, /*"{"*/ "N}" );
}
#endif
-
+
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
return;
}
/* send BER */
bytes = send_ldap_ber( conn, ber );
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
if ( bytes < 0 ) {
return;
}
+#ifdef LDAP_SLAPI
+ slapi_pblock_set( op->o_pb, SLAPI_RESULT_CODE, (void *)err );
+ slapi_pblock_set( op->o_pb, SLAPI_RESULT_MATCHED, ( matched != NULL ) ? (void *)ch_strdup( matched ) : NULL );
+ slapi_pblock_set( op->o_pb, SLAPI_RESULT_TEXT, ( text != NULL ) ? (void *)ch_strdup( text ) : NULL );
+#endif /* LDAP_SLAPI */
+
ldap_pvt_thread_mutex_lock( &num_sent_mutex );
num_bytes_sent += bytes;
num_pdu_sent++;
}
void
-send_ldap_result(
+slap_send_ldap_result(
Connection *conn,
Operation *op,
ber_int_t err,
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ENTRY,
- "send_ldap_result : conn %lu op=%lu p=%d\n",
+ "send_ldap_result: conn %lu op=%lu p=%d\n",
op->o_connid, op->o_opid, op->o_protocol );
#else
Debug( LDAP_DEBUG_TRACE,
assert( err != LDAP_PARTIAL_RESULTS );
if ( err == LDAP_REFERRAL ) {
+#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+ if( op->o_domain_scope ) {
+ ref = NULL;
+ }
+#endif
if( ref == NULL ) {
err = LDAP_NO_SUCH_OBJECT;
} else if ( op->o_protocol < LDAP_VERSION3 ) {
}
void
-send_ldap_extended(
+slap_send_ldap_extended(
Connection *conn,
Operation *op,
ber_int_t err,
rspdata != NULL ? rspdata->bv_len : 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "send_ldap_extended err=%d oid=%s len=%ld\n",
+ "send_ldap_extended: err=%d oid=%s len=%ld\n",
err,
rspoid ? rspoid : "",
rspdata != NULL ? rspdata->bv_len : 0 );
#endif
-
tag = req2res( op->o_tag );
msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
rspoid, rspdata, NULL, ctrls );
}
+#ifdef LDAP_RES_INTERMEDIATE_RESP
+void
+slap_send_ldap_intermediate_resp(
+ Connection *conn,
+ Operation *op,
+ ber_int_t err,
+ const char *matched,
+ const char *text,
+ BerVarray refs,
+ const char *rspoid,
+ struct berval *rspdata,
+ LDAPControl **ctrls )
+{
+ ber_tag_t tag;
+ ber_int_t msgid;
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ENTRY,
+ "send_ldap_intermediate: err=%d oid=%s len=%ld\n",
+ err, rspoid ? rspoid : "",
+ rspdata != NULL ? rspdata->bv_len : 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "send_ldap_intermediate: err=%d oid=%s len=%ld\n",
+ err,
+ rspoid ? rspoid : "",
+ rspdata != NULL ? rspdata->bv_len : 0 );
+#endif
+ tag = LDAP_RES_INTERMEDIATE_RESP;
+ msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
+ send_ldap_response( conn, op, tag, msgid,
+ err, matched, text, refs,
+ rspoid, rspdata, NULL, ctrls );
+}
+#endif
void
-send_search_result(
+slap_send_search_result(
Connection *conn,
Operation *op,
ber_int_t err,
}
int
-send_search_entry(
+slap_send_search_entry(
Backend *be,
Connection *conn,
Operation *op,
LDAPControl **ctrls
)
{
- char berbuf[256];
+ char berbuf[LBER_ELEMENT_SIZEOF];
BerElement *ber = (BerElement *)berbuf;
Attribute *a, *aa;
int i, j, rc=-1, bytes;
char *edn;
int userattrs;
int opattrs;
- static AccessControlState acl_state_init = ACL_STATE_INIT;
- AccessControlState acl_state;
+ AccessControlState acl_state = ACL_STATE_INIT;
+#ifdef LDAP_SLAPI
+ /* Support for computed attribute plugins */
+ computed_attr_context ctx;
+ AttributeName *anp;
+#endif
AttributeDescription *ad_entry = slap_schema.si_ad_entry;
edn = e->e_ndn;
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp)
+ ber = op->o_res_ber;
+ else
+#endif
ber_init_w_nullc( ber, LBER_USE_DER );
#ifdef LDAP_CONNECTIONLESS
- if (conn->c_is_udp) {
- rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
- if (rc != sizeof(struct sockaddr)) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "send_search_entry: conn %lu ber_printf failed\n",
- conn ? conn->c_connid : 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
-#endif
- ber_free_buf( ber );
- return( 1 );
- }
- }
if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
- rc = ber_printf( ber, "{is{t{O{" /*}}}*/,
- op->o_msgid, "", LDAP_RES_SEARCH_ENTRY, &e->e_name );
+ rc = ber_printf(ber, "t{O{" /*}}*/,
+ LDAP_RES_SEARCH_ENTRY, &e->e_name);
} else
-#endif /* LDAP_CONNECTIONLESS */
+#endif
{
rc = ber_printf( ber, "{it{O{" /*}}}*/, op->o_msgid,
LDAP_RES_SEARCH_ENTRY, &e->e_name );
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding DN error", NULL, NULL );
* to ValuesReturnFilter or 0 if not
*/
if ( op->vrFilter != NULL ) {
- int k = 0;
- char *a_flags;
+ int k = 0;
+ size_t size;
for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) k++;
}
- e_flags = ch_calloc ( 1, i * sizeof(char *) + k );
- a_flags = (char *)(e_flags + i);
- for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ );
- e_flags[i] = a_flags;
- a_flags += j;
- }
- rc = filter_matched_values(be, conn, op, e->e_attrs, &e_flags) ;
- if ( rc == -1 ) {
+ size = i * sizeof(char *) + k;
+ if ( size > 0 ) {
+ char *a_flags;
+ e_flags = SLAP_CALLOC ( 1, i * sizeof(char *) + k );
+ if( e_flags == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "send_search_entry: conn %lu matched values filtering failed\n",
- conn ? conn->c_connid : 0, 0, 0 );
+ LDAP_LOG( OPERATION, ERR,
+ "send_search_entry: conn %lu SLAP_CALLOC failed\n",
+ conn ? conn->c_connid : 0, 0, 0 );
#else
- Debug( LDAP_DEBUG_ANY,
- "matched values filtering failed\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "send_search_entry: SLAP_CALLOC failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
-
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "matched values filtering error",
- NULL, NULL );
- goto error_return;
+ ber_free( ber, 1 );
+
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, "memory error",
+ NULL, NULL );
+ goto error_return;
+ }
+ a_flags = (char *)(e_flags + i);
+ memset( a_flags, 0, k );
+ for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
+ for ( j = 0; a->a_vals[j].bv_val != NULL; j++ );
+ e_flags[i] = a_flags;
+ a_flags += j;
+ }
+
+ rc = filter_matched_values(be, conn, op, e->e_attrs, &e_flags) ;
+ if ( rc == -1 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "send_search_entry: conn %lu matched values filtering failed\n",
+ conn ? conn->c_connid : 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "matched values filtering failed\n", 0, 0, 0 );
+#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
+ ber_free( ber, 1 );
+
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, "matched values filtering error",
+ NULL, NULL );
+ goto error_return;
+ }
}
}
}
}
- acl_state = acl_state_init;
-
if ( ! access_allowed( be, conn, op, e, desc, NULL,
ACL_READ, &acl_state ) )
{
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding description error", NULL, NULL );
"ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding values error",
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encode end error", NULL, NULL );
}
}
- /* free e_flags */
- if ( e_flags ) {
- free( e_flags );
- e_flags = NULL;
- }
-
/* eventually will loop through generated operational attributes */
/* only have subschemaSubentry implemented */
aa = backend_operational( be, conn, op, e, attrs, opattrs );
if ( aa != NULL && op->vrFilter != NULL ) {
- int k = 0;
- char *a_flags;
+ int k = 0;
+ size_t size;
for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) k++;
}
- e_flags = ch_calloc ( 1, i * sizeof(char *) + k );
- a_flags = (char *)(e_flags + i);
- for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ );
- e_flags[i] = a_flags;
- a_flags += j;
- }
- rc = filter_matched_values(be, conn, op, aa, &e_flags) ;
-
- if ( rc == -1 ) {
+
+ size = i * sizeof(char *) + k;
+ if ( size > 0 ) {
+ char *a_flags, **tmp;
+
+ /*
+ * Reuse previous memory - we likely need less space
+ * for operational attributes
+ */
+ tmp = SLAP_REALLOC ( e_flags, i * sizeof(char *) + k );
+ if ( tmp == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "send_search_entry: conn %lu "
- "matched values filtering failed\n",
- conn ? conn->c_connid : 0, 0, 0);
+ LDAP_LOG( OPERATION, ERR,
+ "send_search_entry: conn %lu "
+ "not enough memory "
+ "for matched values filtering\n",
+ conn ? conn->c_connid : 0, 0, 0);
#else
- Debug( LDAP_DEBUG_ANY,
- "matched values filtering failed\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "send_search_entry: conn %lu "
+ "not enough memory "
+ "for matched values filtering\n",
+ conn ? conn->c_connid : 0, 0, 0 );
#endif
- ber_free( ber, 1 );
-
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "matched values filtering error",
- NULL, NULL );
- goto error_return;
+ ber_free( ber, 1 );
+
+ send_ldap_result( conn, op, LDAP_NO_MEMORY,
+ NULL, NULL, NULL, NULL );
+ goto error_return;
+ }
+ e_flags = tmp;
+ a_flags = (char *)(e_flags + i);
+ memset( a_flags, 0, k );
+ for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) {
+ for ( j = 0; a->a_vals[j].bv_val != NULL; j++ );
+ e_flags[i] = a_flags;
+ a_flags += j;
+ }
+ rc = filter_matched_values(be, conn, op, aa, &e_flags) ;
+
+ if ( rc == -1 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "send_search_entry: conn %lu "
+ "matched values filtering failed\n",
+ conn ? conn->c_connid : 0, 0, 0);
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "matched values filtering failed\n", 0, 0, 0 );
+#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
+ ber_free( ber, 1 );
+
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, "matched values filtering error",
+ NULL, NULL );
+ goto error_return;
+ }
}
}
}
}
- acl_state = acl_state_init;
-
if ( ! access_allowed( be, conn, op, e, desc, NULL,
ACL_READ, &acl_state ) )
{
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding description error", NULL, NULL );
"ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding values error",
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encode end error", NULL, NULL );
}
}
+#ifdef LDAP_SLAPI
+ /*
+ * First, setup the computed attribute context that is
+ * passed to all plugins.
+ */
+ ctx.cac_pb = op->o_pb;
+ ctx.cac_attrs = attrs;
+ ctx.cac_attrsonly = attrsonly;
+ ctx.cac_userattrs = userattrs;
+ ctx.cac_opattrs = opattrs;
+ ctx.cac_acl_state = acl_state;
+ ctx.cac_private = (void *)ber;
+
+ /*
+ * For each client requested attribute, call the plugins.
+ */
+ if ( attrs != NULL ) {
+ for ( anp = attrs; anp->an_name.bv_val != NULL; anp++ ) {
+ rc = compute_evaluator( &ctx, anp->an_name.bv_val, e, slapi_x_compute_output_ber );
+ if ( rc == 1 ) {
+ break;
+ }
+ }
+ } else {
+ /*
+ * Technically we shouldn't be returning operational attributes
+ * when the user requested only user attributes. We'll let the
+ * plugin decide whether to be naughty or not.
+ */
+ rc = compute_evaluator( &ctx, "*", e, slapi_x_compute_output_ber );
+ }
+ if ( rc == 1 ) {
+ ber_free_buf( ber );
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, "computed attribute error", NULL, NULL );
+ goto error_return;
+ }
+#endif /* LDAP_SLAPI */
+
/* free e_flags */
if ( e_flags ) {
free( e_flags );
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}" );
}
-#ifdef LDAP_CONNECTIONLESS
- if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1)
- rc = ber_printf( ber, "}" );
-#endif
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encode entry end error", NULL, NULL );
return( 1 );
}
- bytes = send_ldap_ber( conn, ber );
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0) {
+#endif
+ bytes = op->o_noop ? 0 : send_ldap_ber( conn, ber );
ber_free_buf( ber );
if ( bytes < 0 ) {
num_pdu_sent++;
ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
+#ifdef LDAP_CONNECTIONLESS
+ }
+#endif
+
Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu ENTRY dn=\"%s\"\n",
conn->c_connid, op->o_opid, e->e_dn, 0, 0 );
}
int
-send_search_reference(
+slap_send_search_reference(
Backend *be,
Connection *conn,
Operation *op,
BerVarray *v2refs
)
{
- char berbuf[256];
+ char berbuf[LBER_ELEMENT_SIZEOF];
BerElement *ber = (BerElement *)berbuf;
int rc;
int bytes;
AttributeDescription *ad_ref = slap_schema.si_ad_ref;
AttributeDescription *ad_entry = slap_schema.si_ad_entry;
+ if (op->o_callback && op->o_callback->sc_sendreference) {
+ return op->o_callback->sc_sendreference( be, conn, op, e, refs, ctrls, v2refs );
+ }
+
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ENTRY,
"send_search_reference: conn %lu dn=\"%s\"\n",
- op->o_connid, e->e_dn, 0 );
+ op->o_connid, e ? e->e_dn : "(null)", 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"=> send_search_reference: dn=\"%s\"\n",
- e->e_dn, 0, 0 );
+ e ? e->e_dn : "(null)", 0, 0 );
#endif
-
- if ( ! access_allowed( be, conn, op, e,
+ if ( e && ! access_allowed( be, conn, op, e,
ad_entry, NULL, ACL_READ, NULL ) )
{
#ifdef NEW_LOGGING
LDAP_LOG( ACL, INFO,
"send_search_reference: conn %lu "
- "access to entry %s not allowed\n", op->o_connid, e->e_dn, 0 );
+ "access to entry %s not allowed\n",
+ op->o_connid, e->e_dn, 0 );
#else
Debug( LDAP_DEBUG_ACL,
"send_search_reference: access to entry not allowed\n",
return( 1 );
}
- if ( ! access_allowed( be, conn, op, e,
+ if ( e && ! access_allowed( be, conn, op, e,
ad_ref, NULL, ACL_READ, NULL ) )
{
#ifdef NEW_LOGGING
return( 1 );
}
+#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+ if( op->o_domain_scope ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, ERR,
+ "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: domainScope control in (%s)\n",
+ e->e_dn, 0, 0 );
+#endif
+
+ return( 0 );
+ }
+#endif
+
if( refs == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ERR,
"send_search_reference: conn %lu null ref in (%s).\n",
- op->o_connid, e->e_dn, 0 );
+ op->o_connid, e ? e->e_dn : "(null)", 0 );
#else
Debug( LDAP_DEBUG_ANY,
"send_search_reference: null ref in (%s)\n",
- e->e_dn, 0, 0 );
+ e ? e->e_dn : "(null)", 0, 0 );
#endif
return( 1 );
if( op->o_protocol < LDAP_VERSION3 ) {
/* save the references for the result */
if( refs[0].bv_val != NULL ) {
- value_add( v2refs, refs );
+ if( value_add( v2refs, refs ) )
+ return LDAP_OTHER;
}
return 0;
}
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp)
+ ber = op->o_res_ber;
+ else
+#endif
ber_init_w_nullc( ber, LBER_USE_DER );
rc = ber_printf( ber, "{it{W}" /*"}"*/ , op->o_msgid,
"send_search_reference: ber_printf failed\n", 0, 0, 0 );
#endif
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0)
+#endif
ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encode DN error", NULL, NULL );
return -1;
}
- bytes = send_ldap_ber( conn, ber );
+#ifdef LDAP_CONNECTIONLESS
+ if (conn->c_is_udp == 0) {
+#endif
+ bytes = op->o_noop ? 0 : send_ldap_ber( conn, ber );
ber_free_buf( ber );
ldap_pvt_thread_mutex_lock( &num_sent_mutex );
num_refs_sent++;
num_pdu_sent++;
ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
+#ifdef LDAP_CONNECTIONLESS
+ }
+#endif
Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu REF dn=\"%s\"\n",
- conn->c_connid, op->o_opid, e->e_dn, 0, 0 );
+ conn->c_connid, op->o_opid, e ? e->e_dn : "(null)", 0, 0 );
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, ENTRY,
projects / openldap / blobdiff