/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
}
}
- v2 = SLAP_MALLOC( len+i+sizeof("Referral:") );
- if( v2 == NULL ) {
- Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
- return NULL;
- }
+ v2 = ch_malloc( len+i+sizeof("Referral:") );
if( text != NULL ) {
strcpy(v2, text);
len += sizeof("Referral:");
for( i=0; ref[i].bv_val != NULL; i++ ) {
- v2 = SLAP_REALLOC( v2, len + ref[i].bv_len + 1 );
- if( v2 == NULL ) {
- Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
- return NULL;
- }
+ v2 = ch_realloc( v2, len + ref[i].bv_len + 1 );
v2[len-1] = '\n';
AC_MEMCPY(&v2[len], ref[i].bv_val, ref[i].bv_len );
len += ref[i].bv_len;
return v2;
}
-static ber_tag_t req2res( ber_tag_t tag )
+ber_tag_t
+slap_req2res( ber_tag_t tag )
{
switch( tag ) {
case LDAP_REQ_ADD:
err, sock_errstr(err), 0 );
if ( err != EWOULDBLOCK && err != EAGAIN ) {
- connection_closing( conn );
+ connection_closing( conn, "connection lost on write" );
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
ber_init2( sber, NULL, LBER_USE_DER );
- ber_printf( sber, "{i}", LDAP_UNWILLING_TO_PERFORM );
+ ber_printf( sber, "{e}", LDAP_UNWILLING_TO_PERFORM );
if( ber_flatten2( ber, &sorted.ldctl_value, 0 ) == -1 ) {
return -1;
}
if ( op->o_callback ) {
- int first = 1;
- slap_callback *sc = op->o_callback,
- *sc_next = op->o_callback;
+ slap_callback *sc = op->o_callback, **sc_prev = &sc, *sc_next;
rc = SLAP_CB_CONTINUE;
for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
sc_next = op->o_callback->sc_next;
if ( op->o_callback->sc_response ) {
+ slap_callback *sc2 = op->o_callback;
rc = op->o_callback->sc_response( op, rs );
- if ( first && op->o_callback == NULL ) {
- sc = NULL;
+ if ( op->o_callback != sc2 ) {
+ *sc_prev = op->o_callback;
}
- if ( rc != SLAP_CB_CONTINUE ) break;
+ if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
+ if ( op->o_callback != sc2 ) continue;
}
- first = 0;
+ sc_prev = &op->o_callback->sc_next;
}
op->o_callback = sc;
clean2:;
if ( op->o_callback ) {
- int first = 1;
- slap_callback *sc = op->o_callback, *sc_next;
+ slap_callback *sc = op->o_callback, **sc_prev = &sc, *sc_next;
for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
sc_next = op->o_callback->sc_next;
if ( op->o_callback->sc_cleanup ) {
+ slap_callback *sc2 = op->o_callback;
(void)op->o_callback->sc_cleanup( op, rs );
- if ( first && op->o_callback != sc ) {
- sc = op->o_callback;
+ if ( op->o_callback != sc2 ) {
+ *sc_prev = op->o_callback;
}
+ if ( !op->o_callback ) break;
+ if ( op->o_callback != sc2 ) continue;
}
- first = 0;
+ sc_prev = &op->o_callback->sc_next;
}
op->o_callback = sc;
}
if ( op->o_protocol < LDAP_VERSION3 ) {
rs->sr_rspoid = NULL;
- rs->sr_tag = req2res( op->o_tag );
+ rs->sr_tag = slap_req2res( op->o_tag );
rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
} else {
assert( rs->sr_err != LDAP_PARTIAL_RESULTS );
if ( rs->sr_err == LDAP_REFERRAL ) {
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
- if( op->o_domain_scope ) {
- rs->sr_ref = NULL;
- }
-#endif
+ if( op->o_domain_scope ) rs->sr_ref = NULL;
+
if( rs->sr_ref == NULL ) {
rs->sr_err = LDAP_NO_SUCH_OBJECT;
} else if ( op->o_protocol < LDAP_VERSION3 ) {
rs->sr_ref = NULL;
}
- rs->sr_tag = req2res( op->o_tag );
+ rs->sr_tag = slap_req2res( op->o_tag );
rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
abandon:
rs->sr_err,
rs->sr_sasldata ? (long) rs->sr_sasldata->bv_len : -1, NULL );
- rs->sr_tag = req2res( op->o_tag );
+ rs->sr_tag = slap_req2res( op->o_tag );
rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
- send_ldap_response( op, rs );
+ if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
+ Statslog( LDAP_DEBUG_STATS,
+ "%s RESULT tag=%lu err=%d text=%s\n",
+ op->o_log_prefix, rs->sr_tag, rs->sr_err,
+ rs->sr_text ? rs->sr_text : "", 0 );
+ }
}
void
rs->sr_rspoid ? rs->sr_rspoid : "",
rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 );
- rs->sr_tag = req2res( op->o_tag );
+ rs->sr_tag = slap_req2res( op->o_tag );
rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
- send_ldap_response( op, rs );
+ if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
+ Statslog( LDAP_DEBUG_STATS,
+ "%s RESULT oid=%s err=%d text=%s\n",
+ op->o_log_prefix, rs->sr_rspoid ? rs->sr_rspoid : "",
+ rs->sr_err, rs->sr_text ? rs->sr_text : "", 0 );
+ }
}
void
rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 );
rs->sr_tag = LDAP_RES_INTERMEDIATE;
rs->sr_msgid = op->o_msgid;
- send_ldap_response( op, rs );
+ if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
+ Statslog( LDAP_DEBUG_STATS2,
+ "%s INTERM oid=%s\n",
+ op->o_log_prefix,
+ rs->sr_rspoid ? rs->sr_rspoid : "", 0, 0, 0 );
+ }
}
+/*
+ * returns:
+ *
+ * LDAP_SUCCESS entry sent
+ * LDAP_OTHER entry not sent (other)
+ * LDAP_INSUFFICIENT_ACCESS entry not sent (ACL)
+ * LDAP_UNAVAILABLE entry not sent (connection closed)
+ * LDAP_SIZELIMIT_EXCEEDED entry not sent (caller must send sizelimitExceeded)
+ */
+
int
slap_send_search_entry( Operation *op, SlapReply *rs )
{
BerElementBuffer berbuf;
BerElement *ber = (BerElement *) &berbuf;
Attribute *a;
- int i, j, rc=-1, bytes;
+ int i, j, rc = LDAP_UNAVAILABLE, bytes;
char *edn;
int userattrs;
AccessControlState acl_state = ACL_STATE_INIT;
* e_flags: array of a_flags
*/
char **e_flags = NULL;
-
+
+ if ( op->ors_slimit >= 0 && rs->sr_nentries >= op->ors_slimit ) {
+ return LDAP_SIZELIMIT_EXCEEDED;
+ }
+
rs->sr_type = REP_SEARCH;
/* eventually will loop through generated operational attribute types
}
if ( op->o_callback ) {
- int first = 1;
- slap_callback *sc = op->o_callback,
- *sc_next = op->o_callback;
+ slap_callback *sc = op->o_callback, **sc_prev = &sc, *sc_next;
rc = SLAP_CB_CONTINUE;
for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next )
{
sc_next = op->o_callback->sc_next;
if ( op->o_callback->sc_response ) {
+ slap_callback *sc2 = op->o_callback;
rc = op->o_callback->sc_response( op, rs );
- if ( first && op->o_callback == NULL ) {
- sc = NULL;
+ if ( op->o_callback != sc2 ) {
+ *sc_prev = op->o_callback;
}
- if ( rc != SLAP_CB_CONTINUE ) break;
+ if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
+ if ( op->o_callback != sc2 ) continue;
}
- first = 0;
+ sc_prev = &op->o_callback->sc_next;
}
op->o_callback = sc;
"send_search_entry: conn %lu access to entry (%s) not allowed\n",
op->o_connid, rs->sr_entry->e_name.bv_val, 0 );
- rc = 1;
+ rc = LDAP_INSUFFICIENT_ACCESS;
goto error_return;
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER, "encoding DN error" );
+ rc = rs->sr_err;
goto error_return;
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER,
"matched values filtering error" );
+ rc = rs->sr_err;
goto error_return;
}
}
int finish = 0;
if ( rs->sr_attrs == NULL ) {
- /* all attrs request, skip operational attributes */
+ /* all user attrs request, skip operational attributes */
if( is_at_operational( desc->ad_type ) ) {
continue;
}
/* specific attrs requested */
if ( is_at_operational( desc->ad_type ) ) {
if ( !SLAP_OPATTRS( rs->sr_attr_flags ) &&
- !ad_inlist( desc, rs->sr_attrs ) )
+ !ad_inlist( desc, rs->sr_attrs ) )
{
continue;
}
} else {
- if ( !userattrs && !ad_inlist( desc, rs->sr_attrs ) )
- {
+ if ( !userattrs && !ad_inlist( desc, rs->sr_attrs ) ) {
continue;
}
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER,
"encoding description error");
+ rc = rs->sr_err;
goto error_return;
}
finish = 1;
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER,
"encoding description error");
+ rc = rs->sr_err;
goto error_return;
}
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER,
"encoding values error" );
+ rc = rs->sr_err;
goto error_return;
}
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER, "encode end error" );
+ rc = rs->sr_err;
goto error_return;
}
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER,
"matched values filtering error" );
+ rc = rs->sr_err;
goto error_return;
}
}
AttributeDescription *desc = a->a_desc;
if ( rs->sr_attrs == NULL ) {
- /* all attrs request, skip operational attributes */
+ /* all user attrs request, skip operational attributes */
if( is_at_operational( desc->ad_type ) ) {
continue;
}
/* specific attrs requested */
if( is_at_operational( desc->ad_type ) ) {
if ( !SLAP_OPATTRS( rs->sr_attr_flags ) &&
- !ad_inlist( desc, rs->sr_attrs ) )
+ !ad_inlist( desc, rs->sr_attrs ) )
{
continue;
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER,
"encoding description error" );
+ rc = rs->sr_err;
goto error_return;
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER,
"encoding values error" );
+ rc = rs->sr_err;
goto error_return;
}
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER, "encode end error" );
+ rc = rs->sr_err;
goto error_return;
}
}
if ( op->o_res_ber == NULL ) ber_free_buf( ber );
send_ldap_error( op, rs, LDAP_OTHER, "encode entry end error" );
- rc = 1;
+ rc = rs->sr_err;
goto error_return;
}
"send_search_entry: conn %lu ber write failed.\n",
op->o_connid, 0, 0 );
- rc = -1;
+ rc = LDAP_UNAVAILABLE;
goto error_return;
}
rs->sr_nentries++;
Debug( LDAP_DEBUG_TRACE,
"<= send_search_entry: conn %lu exit.\n", op->o_connid, 0, 0 );
- rc = 0;
+ rc = LDAP_SUCCESS;
error_return:;
if ( op->o_callback ) {
- int first = 1;
- slap_callback *sc = op->o_callback, *sc_next;
+ slap_callback *sc = op->o_callback, **sc_prev = &sc, *sc_next;
for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
sc_next = op->o_callback->sc_next;
if ( op->o_callback->sc_cleanup ) {
+ slap_callback *sc2 = op->o_callback;
(void)op->o_callback->sc_cleanup( op, rs );
- if ( first && op->o_callback != sc ) {
- sc = op->o_callback;
+ if ( op->o_callback != sc2 ) {
+ *sc_prev = op->o_callback;
}
+ if ( !op->o_callback ) break;
+ if ( op->o_callback != sc2 ) continue;
}
- first = 0;
+ sc_prev = &op->o_callback->sc_next;
}
op->o_callback = sc;
}
rs->sr_type = REP_SEARCHREF;
if ( op->o_callback ) {
- int first = 1;
- slap_callback *sc = op->o_callback,
- *sc_next = op->o_callback;
+ slap_callback *sc = op->o_callback, **sc_prev = &sc, *sc_next;
rc = SLAP_CB_CONTINUE;
for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
sc_next = op->o_callback->sc_next;
if ( op->o_callback->sc_response ) {
+ slap_callback *sc2 = op->o_callback;
rc = op->o_callback->sc_response( op, rs );
- if ( first && op->o_callback == NULL ) {
- sc = NULL;
+ if ( op->o_callback != sc2 ) {
+ *sc_prev = op->o_callback;
}
- if ( rc != SLAP_CB_CONTINUE ) break;
+ if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
+ if ( op->o_callback != sc2 ) continue;
}
- first = 0;
+ sc_prev = &op->o_callback->sc_next;
}
op->o_callback = sc;
goto rel;
}
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
if( op->o_domain_scope ) {
Debug( LDAP_DEBUG_ANY,
"send_search_reference: domainScope control in (%s)\n",
rc = 0;
goto rel;
}
-#endif
if( rs->sr_ref == NULL ) {
Debug( LDAP_DEBUG_ANY,
bytes = send_ldap_ber( op->o_conn, ber );
ber_free_buf( ber );
- ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
- ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
- ldap_pvt_mp_add_ulong( slap_counters.sc_refs, 1 );
- ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
- ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
+ if ( bytes < 0 ) {
+ rc = LDAP_UNAVAILABLE;
+ } else {
+ ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
+ ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
+ ldap_pvt_mp_add_ulong( slap_counters.sc_refs, 1 );
+ ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
+ ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
+ }
#ifdef LDAP_CONNECTIONLESS
}
#endif
+ if ( rs->sr_ref != NULL ) {
+ int r;
- Statslog( LDAP_DEBUG_STATS2, "%s REF dn=\"%s\"\n",
- op->o_log_prefix, rs->sr_entry ? rs->sr_entry->e_dn : "(null)",
- 0, 0, 0 );
+ for ( r = 0; !BER_BVISNULL( &rs->sr_ref[ r ] ); r++ ) {
+ Statslog( LDAP_DEBUG_STATS2, "%s REF #%d \"%s\"\n",
+ op->o_log_prefix, r, rs->sr_ref[0].bv_val,
+ 0, 0 );
+ }
+
+ } else {
+ Statslog( LDAP_DEBUG_STATS2, "%s REF \"(null)\"\n",
+ op->o_log_prefix, 0, 0, 0, 0 );
+ }
Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
rel:
if ( op->o_callback ) {
- int first = 1;
- slap_callback *sc = op->o_callback, *sc_next;
+ slap_callback *sc = op->o_callback, **sc_prev = &sc, *sc_next;
for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
sc_next = op->o_callback->sc_next;
if ( op->o_callback->sc_cleanup ) {
+ slap_callback *sc2 = op->o_callback;
(void)op->o_callback->sc_cleanup( op, rs );
- if ( first && op->o_callback != sc ) {
- sc = op->o_callback;
+ if ( op->o_callback != sc2 ) {
+ *sc_prev = op->o_callback;
}
+ if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
+ if ( op->o_callback != sc2 ) continue;
}
- first = 0;
+ sc_prev = &op->o_callback->sc_next;
}
op->o_callback = sc;
}
}
if ( strncasecmp( s, "code", STRLENOF( "code" ) ) == 0 ) {
- if ( c != NULL ) {
- *code = atoi( c );
+ char *next = NULL;
+ long retcode;
+
+ if ( c == NULL ) {
+ Debug( LDAP_DEBUG_ANY, "str2result (%s) missing value\n",
+ s, 0, 0 );
+ rc = -1;
+ continue;
+ }
+
+ while ( isspace( (unsigned char) c[ 0 ] ) ) c++;
+ if ( c[ 0 ] == '\0' ) {
+ Debug( LDAP_DEBUG_ANY, "str2result (%s) missing or empty value\n",
+ s, 0, 0 );
+ rc = -1;
+ continue;
+ }
+
+ retcode = strtol( c, &next, 10 );
+ if ( next == NULL || next == c ) {
+ Debug( LDAP_DEBUG_ANY, "str2result (%s) unable to parse value\n",
+ s, 0, 0 );
+ rc = -1;
+ continue;
}
+
+ while ( isspace( (unsigned char) next[ 0 ] ) ) next++;
+ if ( next[ 0 ] != '\0' ) {
+ Debug( LDAP_DEBUG_ANY, "str2result (%s) extra cruft after value\n",
+ s, 0, 0 );
+ rc = -1;
+ continue;
+ }
+
+ /* FIXME: what if it's larger that max int? */
+ *code = (int)retcode;
+
} else if ( strncasecmp( s, "matched", STRLENOF( "matched" ) ) == 0 ) {
if ( c != NULL ) {
*matched = c;
myop.o_bd = NULL;
myop.o_res_ber = ber;
myop.o_callback = NULL;
+ myop.ors_slimit = 1;
rc = slap_send_search_entry( &myop, rs );
if( rc ) return rc;