/* result.c - routines to send ldap results, errors, and referrals */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "slap.h"
-static char *v2ref( struct berval **ref, const char *text )
+static char *v2ref( BerVarray ref, const char *text )
{
size_t len = 0, i = 0;
char *v2;
strcpy( v2+len, "Referral:" );
len += sizeof("Referral:");
- for( i=0; ref[i] != NULL; i++ ) {
- v2 = ch_realloc( v2, len + ref[i]->bv_len + 1 );
+ for( i=0; ref[i].bv_val != NULL; i++ ) {
+ 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;
- if (ref[i]->bv_val[ref[i]->bv_len-1] != '/') {
+ AC_MEMCPY(&v2[len], ref[i].bv_val, ref[i].bv_len );
+ len += ref[i].bv_len;
+ if (ref[i].bv_val[ref[i].bv_len-1] != '/') {
++len;
}
}
err, sock_errstr(err), 0 );
#endif
-
if ( err != EWOULDBLOCK && err != EAGAIN ) {
connection_closing( conn );
ber_int_t err,
const char *matched,
const char *text,
- struct berval **ref,
+ BerVarray ref,
const char *resoid,
struct berval *resdata,
struct berval *sasldata,
int rc;
long bytes;
- if (op->o_response) {
- op->o_response( conn, op, tag, msgid, err, matched,
+ if (op->o_callback && op->o_callback->sc_response) {
+ op->o_callback->sc_response( conn, op, tag, msgid, err, matched,
text, ref, resoid, resdata, sasldata, ctrls );
return;
}
(long) msgid, (long) tag, (long) err );
#endif
-
if( ref ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"send_ldap_response: conn %d ref=\"%s\"\n",
conn ? conn->c_connid : 0,
- ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
+ ref[0].bv_val ? ref[0].bv_val : "NULL" ));
#else
Debug( LDAP_DEBUG_ARGS, "send_ldap_response: ref=\"%s\"\n",
- ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL",
+ ref[0].bv_val ? ref[0].bv_val : "NULL",
NULL, NULL );
#endif
if( rc != -1 ) {
if ( ref != NULL ) {
assert( err == LDAP_REFERRAL );
- rc = ber_printf( ber, "t{V}",
+ rc = ber_printf( ber, "t{W}",
LDAP_TAG_REFERRAL, ref );
} else {
assert( err != LDAP_REFERRAL );
ber_int_t err,
const char *matched,
const char *text,
- struct berval **ref,
+ BerVarray ref,
LDAPControl **ctrls
)
{
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"send_ldap_result: referral=\"%s\"\n",
- ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
+ ref[0].bv_val ? ref[0].bv_val : "NULL" ));
#else
Debug( LDAP_DEBUG_ARGS,
"send_ldap_result: referral=\"%s\"\n",
- ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL",
+ ref[0].bv_val ? ref[0].bv_val : "NULL",
NULL, NULL );
#endif
}
ber_int_t err,
const char *matched,
const char *text,
- struct berval **ref,
+ BerVarray ref,
LDAPControl **ctrls,
struct berval *cred
)
ber_int_t err,
const char *matched,
const char *text,
- struct berval **refs,
+ BerVarray refs,
const char *rspoid,
struct berval *rspdata,
LDAPControl **ctrls
ber_int_t err,
const char *matched,
const char *text,
- struct berval **refs,
+ BerVarray refs,
LDAPControl **ctrls,
int nentries
)
assert( !LDAP_API_ERROR( err ) );
- if (op->o_sresult) {
- op->o_sresult(conn, op, err, matched, text, refs,
+ if (op->o_callback && op->o_callback->sc_sresult) {
+ op->o_callback->sc_sresult(conn, op, err, matched, text, refs,
ctrls, nentries);
return;
}
)
{
char berbuf[256];
- BerElement *ber = (BerElement *)berbuf;;
+ BerElement *ber = (BerElement *)berbuf;
Attribute *a, *aa;
int i, rc=-1, bytes;
char *edn;
AttributeDescription *ad_entry = slap_schema.si_ad_entry;
+ if (op->o_callback && op->o_callback->sc_sendentry) {
+ return op->o_callback->sc_sendentry( be, conn, op, e, attrs,
+ attrsonly, ctrls );
+ }
+
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_entry: conn %d dn=\"%s\"%s\n",
}
if ( ! attrsonly ) {
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ for ( i = 0; a->a_vals[i].bv_val != NULL; i++ ) {
if ( ! access_allowed( be, conn, op, e,
- desc, a->a_vals[i], ACL_READ ) )
+ desc, &a->a_vals[i], ACL_READ ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
continue;
}
- if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
+ if (( rc = ber_printf( ber, "O", &a->a_vals[i] )) == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed.\n",
}
if ( ! attrsonly ) {
- for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+ for ( i = 0; a->a_vals[i].bv_val != NULL; i++ ) {
if ( ! access_allowed( be, conn, op, e,
- desc, a->a_vals[i], ACL_READ ) )
+ desc, &a->a_vals[i], ACL_READ ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
}
- if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
+ if (( rc = ber_printf( ber, "O", &a->a_vals[i] )) == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
Connection *conn,
Operation *op,
Entry *e,
- struct berval **refs,
+ BerVarray refs,
LDAPControl **ctrls,
- struct berval ***v2refs
+ BerVarray *v2refs
)
{
char berbuf[256];
if( op->o_protocol < LDAP_VERSION3 ) {
/* save the references for the result */
- if( *refs != NULL ) {
+ if( refs[0].bv_val != NULL ) {
value_add( v2refs, refs );
}
return 0;
ber_init_w_nullc( ber, LBER_USE_DER );
- rc = ber_printf( ber, "{it{V}N}", op->o_msgid,
+ rc = ber_printf( ber, "{it{W}N}", op->o_msgid,
LDAP_RES_SEARCH_REFERENCE, refs );
if ( rc == -1 ) {