/* 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,
LDAPControl **ctrls
)
{
- BerElement *ber;
+ char berbuf[256];
+ BerElement *ber = (BerElement *)berbuf;
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;
}
assert( ctrls == NULL ); /* ctrls not implemented */
- ber = ber_alloc_t( LBER_USE_DER );
+ ber_init_w_nullc( ber, LBER_USE_DER );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
(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 ( ber == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "send_ldap_response: conn %d ber_alloc failed\n",
- conn ? conn->c_connid : 0 ));
-#else
- Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
-#endif
-
- return;
- }
-
#ifdef LDAP_CONNECTIONLESS
if (conn->c_is_udp) {
rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
#else
Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
#endif
- ber_free(ber, 1);
+ ber_free_buf( ber );
return;
}
}
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 );
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ ber_free_buf( ber );
return;
}
/* send BER */
bytes = send_ldap_ber( conn, ber );
- ber_free( ber, 1 );
+ ber_free_buf( ber );
if ( bytes < 0 ) {
#ifdef NEW_LOGGING
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;
}
Connection *conn,
Operation *op,
Entry *e,
- struct berval **attrs,
+ AttributeName *attrs,
int attrsonly,
LDAPControl **ctrls
)
{
- BerElement *ber;
+ char berbuf[256];
+ 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",
edn = e->e_ndn;
- ber = ber_alloc_t( LBER_USE_DER );
-
- if ( ber == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "send_search_entry: conn %d ber_alloc failed\n",
- op->o_connid ));
-#else
- Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
-#endif
-
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "BER allocation error", NULL, NULL );
- goto error_return;
- }
+ ber_init_w_nullc( ber, LBER_USE_DER );
#ifdef LDAP_CONNECTIONLESS
if (conn->c_is_udp) {
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free(ber, 1);
+ ber_free_buf( ber );
return;
}
}
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding DN error", NULL, NULL );
goto error_return;
/* check for special all user attributes ("*") type */
userattrs = ( attrs == NULL ) ? 1
- : bvec_inlist( attrs, &AllUser );
+ : an_find( attrs, &AllUser );
/* check for special all operational attributes ("+") type */
opattrs = ( attrs == NULL ) ? 0
- : bvec_inlist( attrs, &AllOper );
+ : an_find( attrs, &AllOper );
for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
AttributeDescription *desc = a->a_desc;
if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
- "send_search_entry: conn %d access to attribute %s not allowed\n",
- op->o_connid, desc->ad_cname.bv_val ));
+ LDAP_LOG(( "acl", LDAP_LEVEL_INFO, "send_search_entry: "
+ "conn %d access to attribute %s not allowed\n",
+ op->o_connid, desc->ad_cname.bv_val ));
#else
- Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
+ Debug( LDAP_DEBUG_ACL, "acl: "
+ "access to attribute %s not allowed\n",
desc->ad_cname.bv_val, 0, 0 );
#endif
if (( rc = ber_printf( ber, "{O[" /*]}*/ , &desc->ad_cname )) == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "send_search_entry: conn %d ber_printf failed\n",
- op->o_connid ));
+ "send_search_entry: conn %d ber_printf failed\n",
+ op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding description error", NULL, NULL );
goto error_return;
}
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",
"ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding values error", NULL, NULL );
goto error_return;
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encode end error", NULL, NULL );
goto error_return;
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding description error", NULL, NULL );
attrs_free( aa );
}
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",
"ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encoding values error", NULL, NULL );
attrs_free( aa );
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ ber_free_buf( ber );
send_ldap_result( conn, op, LDAP_OTHER,
NULL, "encode end error", NULL, NULL );
attrs_free( aa );
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ 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 );
- ber_free( ber, 1 );
+ ber_free_buf( ber );
if ( bytes < 0 ) {
#ifdef NEW_LOGGING
Connection *conn,
Operation *op,
Entry *e,
- struct berval **refs,
+ BerVarray refs,
LDAPControl **ctrls,
- struct berval ***v2refs
+ BerVarray *v2refs
)
{
- BerElement *ber;
+ char berbuf[256];
+ BerElement *ber = (BerElement *)berbuf;
int rc;
int bytes;
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 = ber_alloc_t( LBER_USE_DER );
-
- if ( ber == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "send_search_reference: conn %d ber_alloc failed\n",
- op->o_connid ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "send_search_reference: ber_alloc failed\n", 0, 0, 0 );
-#endif
-
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "alloc BER error", NULL, NULL );
- return -1;
- }
+ 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 ) {
"send_search_reference: ber_printf failed\n", 0, 0, 0 );
#endif
- ber_free( ber, 1 );
+ 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 );
- ber_free( ber, 1 );
+ ber_free_buf( ber );
ldap_pvt_thread_mutex_lock( &num_sent_mutex );
num_bytes_sent += bytes;
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "str2result: (%s) unknown.\n", s ));
+ "str2result: (%s) unknown.\n", s ));
#else
Debug( LDAP_DEBUG_ANY, "str2result (%s) unknown\n",
s, 0, 0 );
projects / openldap / blobdiff