X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fresult.c;h=228d4efdc4f666e39cae25e8f30820896a9f4fa4;hb=e25f6ef0cdd1780577dffeaca8ba8b19b5697880;hp=e8aecf2a4de652586efcc5010d7b3d4ed6d58a62;hpb=f49fd8a98e6849f74e50a01165f4214b065b9b00;p=openldap

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index e8aecf2a4d..228d4efdc4 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -1,7 +1,7 @@
 /* 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
  */
 
@@ -19,7 +19,7 @@
 
 #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;
@@ -49,12 +49,12 @@ static char *v2ref( struct berval **ref, const char *text )
 	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;
 		}
 	}
@@ -95,87 +95,6 @@ static ber_tag_t req2res( ber_tag_t tag )
 	return tag;
 }
 
-static void trim_refs_urls(
-	struct berval **refs )
-{
-	unsigned i;
-
-	if( refs == NULL ) return;
-
-	for( i=0; refs[i] != NULL; i++ ) {
-		if(	refs[i]->bv_len > sizeof("ldap://")-1 &&
-			strncasecmp( refs[i]->bv_val, "ldap://",
-				sizeof("ldap://")-1 ) == 0 )
-		{
-			unsigned j;
-			for( j=sizeof("ldap://")-1; j<refs[i]->bv_len ; j++ ) {
-				if( refs[i]->bv_val[j] == '/' ) {
-					refs[i]->bv_val[j] = '\0';
-					refs[i]->bv_len = j;
-					break;
-				}
-			}
-		}
-	}
-}
-
-struct berval **get_entry_referrals(
-	Backend *be,
-	Connection *conn,
-	Operation *op,
-	Entry *e )
-{
-	Attribute *attr;
-	struct berval **refs;
-	unsigned i, j;
-
-	AttributeDescription *ad_ref = slap_schema.si_ad_ref;
-
-	attr = attr_find( e->e_attrs, ad_ref );
-
-	if( attr == NULL ) return NULL;
-
-	for( i=0; attr->a_vals[i] != NULL; i++ ) {
-		/* count references */
-	}
-
-	if( i < 1 ) return NULL;
-
-	refs = ch_malloc( (i + 1) * sizeof(struct berval *));
-
-	for( i=0, j=0; attr->a_vals[i] != NULL; i++ ) {
-		unsigned k;
-		struct berval *ref = ber_bvdup( attr->a_vals[i] );
-
-		/* trim the label */
-		for( k=0; k<ref->bv_len; k++ ) {
-			if( isspace(ref->bv_val[k]) ) {
-				ref->bv_val[k] = '\0';
-				ref->bv_len = k;
-				break;
-			}
-		}
-
-		if(	ref->bv_len > 0 ) {
-			refs[j++] = ref;
-
-		} else {
-			ber_bvfree( ref );
-		}
-	}
-
-	refs[j] = NULL;
-
-	if( j == 0 ) {
-		ber_bvecfree( refs );
-		refs = NULL;
-	}
-
-	/* we should check that a referral value exists... */
-
-	return refs;
-}
-
 static long send_ldap_ber(
 	Connection *conn,
 	BerElement *ber )
@@ -223,7 +142,6 @@ static long send_ldap_ber(
 		    err, sock_errstr(err), 0 );
 #endif
 
-
 		if ( err != EWOULDBLOCK && err != EAGAIN ) {
 			connection_closing( conn );
 
@@ -257,20 +175,27 @@ send_ldap_response(
     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_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,
@@ -282,42 +207,53 @@ send_ldap_response(
 		(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 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", LDAP_LEVEL_ERR,
-			   "send_ldap_response: conn %d  ber_alloc failed\n",
+			   "send_ldap_response: conn %d  ber_write failed\n",
 			   conn ? conn->c_connid : 0 ));
 #else
-		Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
+		Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
 #endif
-
+		ber_free_buf( ber );
 		return;
+	    }
 	}
-
-	rc = ber_printf( ber, "{it{ess",
+	if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
+	    rc = ber_printf( ber, "{is{t{ess",
+		msgid, "", tag, err,
+		matched == NULL ? "" : matched,
+		text == NULL ? "" : text );
+	} else
+#endif
+	{
+	    rc = ber_printf( ber, "{it{ess",
 		msgid, tag, err,
 		matched == NULL ? "" : matched,
 		text == NULL ? "" : text );
+	}
 
 	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 );
@@ -342,6 +278,11 @@ send_ldap_response(
 	if( rc != -1 ) {
 		rc = ber_printf( ber, "N}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
@@ -352,13 +293,13 @@ send_ldap_response(
 		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
@@ -428,9 +369,9 @@ send_ldap_disconnect(
 		reqoid, NULL, NULL, NULL );
 
 	Statslog( LDAP_DEBUG_STATS,
-	    "conn=%ld op=%ld DISCONNECT err=%ld tag=%lu text=%s\n",
+	    "conn=%ld op=%ld DISCONNECT tag=%lu err=%ld text=%s\n",
 		(long) op->o_connid, (long) op->o_opid,
-		(long) tag, (long) err, text ? text : "" );
+		(unsigned long) tag, (long) err, text ? text : "" );
 }
 
 void
@@ -440,7 +381,7 @@ send_ldap_result(
     ber_int_t	err,
     const char	*matched,
     const char	*text,
-	struct berval **ref,
+	BerVarray ref,
 	LDAPControl **ctrls
 )
 {
@@ -474,23 +415,18 @@ send_ldap_result(
 	if( ref ) {
 #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" ));
+			"send_ldap_result: referral=\"%s\"\n",
+			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
-
 	}
 
 	assert( err != LDAP_PARTIAL_RESULTS );
 
-	if( op->o_tag != LDAP_REQ_SEARCH ) {
-		trim_refs_urls( ref );
-	}
-
 	if ( err == LDAP_REFERRAL ) {
 		if( ref == NULL ) {
 			err = LDAP_NO_SUCH_OBJECT;
@@ -515,7 +451,7 @@ send_ldap_result(
 	Statslog( LDAP_DEBUG_STATS,
 	    "conn=%ld op=%ld RESULT tag=%lu err=%ld text=%s\n",
 		(long) op->o_connid, (long) op->o_opid,
-		(long) tag, (long) err, text ? text : "" );
+		(unsigned long) tag, (long) err, text ? text : "" );
 
 	if( tmp != NULL ) {
 		ch_free(tmp);
@@ -529,7 +465,7 @@ send_ldap_sasl(
     ber_int_t	err,
     const char	*matched,
     const char	*text,
-	struct berval **ref,
+	BerVarray ref,
 	LDAPControl **ctrls,
 	struct berval *cred
 )
@@ -562,7 +498,7 @@ send_ldap_extended(
     ber_int_t	err,
     const char	*matched,
     const char	*text,
-    struct berval **refs,
+    BerVarray	refs,
     const char		*rspoid,
 	struct berval *rspdata,
 	LDAPControl **ctrls
@@ -601,7 +537,7 @@ send_search_result(
     ber_int_t	err,
     const char	*matched,
 	const char	*text,
-    struct berval **refs,
+    BerVarray	refs,
 	LDAPControl **ctrls,
     int		nentries
 )
@@ -609,8 +545,15 @@ send_search_result(
 	ber_tag_t tag;
 	ber_int_t msgid;
 	char *tmp = NULL;
+
 	assert( !LDAP_API_ERROR( err ) );
 
+	if (op->o_callback && op->o_callback->sc_sresult) {
+		op->o_callback->sc_sresult(conn, op, err, matched, text, refs,
+			ctrls, nentries);
+		return;
+	}
+
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
 		   "send_search_result: conn %d err=%d matched=\"%s\"\n",
@@ -625,8 +568,6 @@ send_search_result(
 
 	assert( err != LDAP_PARTIAL_RESULTS );
 
-	trim_refs_urls( refs );
-
 	if( op->o_protocol < LDAP_VERSION3 ) {
 		/* send references in search results */
 		if( err == LDAP_REFERRAL ) {
@@ -657,13 +598,17 @@ send_search_result(
 	Statslog( LDAP_DEBUG_STATS,
 	    "conn=%ld op=%ld SEARCH RESULT tag=%lu err=%ld text=%s\n",
 		(long) op->o_connid, (long) op->o_opid,
-		(long) tag, (long) err, text ? text : "" );
+		(unsigned long) tag, (long) err, text ? text : "" );
 
 	if (tmp != NULL) {
 	    ch_free(tmp);
 	}
 }
 
+static struct berval AllUser = { sizeof(LDAP_ALL_USER_ATTRIBUTES)-1,
+	LDAP_ALL_USER_ATTRIBUTES };
+static struct berval AllOper = { sizeof(LDAP_ALL_OPERATIONAL_ATTRIBUTES)-1,
+	LDAP_ALL_OPERATIONAL_ATTRIBUTES };
 
 int
 send_search_entry(
@@ -671,12 +616,13 @@ send_search_entry(
     Connection	*conn,
     Operation	*op,
     Entry	*e,
-    char	**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;
@@ -685,6 +631,11 @@ send_search_entry(
 
 	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",
@@ -715,24 +666,32 @@ send_search_entry(
 
 	edn = e->e_ndn;
 
-	ber = ber_alloc_t( LBER_USE_DER );
+	ber_init_w_nullc( ber, LBER_USE_DER );
 
-	if ( ber == NULL ) {
+#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", LDAP_LEVEL_ERR,
-			   "send_search_entry: conn %d  ber_alloc failed\n",
-			   op->o_connid ));
+			   "send_search_entry: conn %d  ber_printf failed\n",
+			   conn ? conn->c_connid : 0 ));
 #else
-		Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
+		Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
-
-		send_ldap_result( conn, op, LDAP_OTHER,
-			NULL, "BER allocation error", NULL, NULL );
-		goto error_return;
+		ber_free_buf( ber );
+		return;
+	    }
+	}
+	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 );
+	} else
+#endif
+	{
+	    rc = ber_printf( ber, "{it{O{" /*}}}*/, op->o_msgid,
+		LDAP_RES_SEARCH_ENTRY, &e->e_name );
 	}
-
-	rc = ber_printf( ber, "{it{s{" /*}}}*/, op->o_msgid,
-		LDAP_RES_SEARCH_ENTRY, e->e_dn );
 
 	if ( rc == -1 ) {
 #ifdef NEW_LOGGING
@@ -743,7 +702,7 @@ send_search_entry(
 		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;
@@ -751,24 +710,23 @@ send_search_entry(
 
 	/* check for special all user attributes ("*") type */
 	userattrs = ( attrs == NULL ) ? 1
-		: charray_inlist( attrs, LDAP_ALL_USER_ATTRIBUTES );
+		: an_find( attrs, &AllUser );
 
 	/* check for special all operational attributes ("+") type */
 	opattrs = ( attrs == NULL ) ? 0
-		: charray_inlist( attrs, LDAP_ALL_OPERATIONAL_ATTRIBUTES );
+		: an_find( attrs, &AllOper );
 
 	for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
 		AttributeDescription *desc = a->a_desc;
-		char *type = desc->ad_cname->bv_val;
 
 		if ( attrs == NULL ) {
-			/* all addrs request, skip operational attributes */
+			/* all attrs request, skip operational attributes */
 			if( is_at_operational( desc->ad_type ) ) {
 				continue;
 			}
 
 		} else {
-			/* specific addrs requested */
+			/* specific attrs requested */
 			if ( is_at_operational( desc->ad_type ) ) {
 				if( !opattrs && !ad_inlist( desc, attrs ) ) {
 					continue;
@@ -783,51 +741,52 @@ send_search_entry(
 
 		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",
-			    desc->ad_cname->bv_val, 0, 0 );
+			Debug( LDAP_DEBUG_ACL, "acl: "
+				"access to attribute %s not allowed\n",
+			    desc->ad_cname.bv_val, 0, 0 );
 #endif
 
 			continue;
 		}
 
-		if (( rc = ber_printf( ber, "{s[" /*]}*/ , type )) == -1 ) {
+		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,
 						   "send_search_entry: conn %d  access to attribute %s, value %d not allowed\n",
-						   op->o_connid, desc->ad_cname->bv_val, i ));
+						   op->o_connid, desc->ad_cname.bv_val, i ));
 #else
 					Debug( LDAP_DEBUG_ACL,
 						"acl: access to attribute %s, value %d not allowed\n",
-					desc->ad_cname->bv_val, i, 0 );
+					desc->ad_cname.bv_val, i, 0 );
 #endif
 
 					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",
@@ -837,7 +796,7 @@ send_search_entry(
 					    "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;
@@ -854,7 +813,7 @@ send_search_entry(
 			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;
@@ -863,19 +822,19 @@ send_search_entry(
 
 	/* eventually will loop through generated operational attributes */
 	/* only have subschemaSubentry implemented */
-	aa = backend_operational( be, conn, op, e );
+	aa = backend_operational( be, conn, op, e, attrs, opattrs );
 	
 	for (a = aa ; a != NULL; a = a->a_next ) {
 		AttributeDescription *desc = a->a_desc;
 
 		if ( attrs == NULL ) {
-			/* all addrs request, skip operational attributes */
+			/* all attrs request, skip operational attributes */
 			if( is_at_operational( desc->ad_type ) ) {
 				continue;
 			}
 
 		} else {
-			/* specific addrs requested */
+			/* specific attrs requested */
 			if( is_at_operational( desc->ad_type ) ) {
 				if( !opattrs && !ad_inlist( desc, attrs ) ) {
 					continue;
@@ -892,16 +851,16 @@ send_search_entry(
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
 				   "send_search_entry: conn %s  access to attribute %s not allowed\n",
-				   op->o_connid, desc->ad_cname->bv_val ));
+				   op->o_connid, desc->ad_cname.bv_val ));
 #else
 			Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
-			    desc->ad_cname->bv_val, 0, 0 );
+			    desc->ad_cname.bv_val, 0, 0 );
 #endif
 
 			continue;
 		}
 
-		rc = ber_printf( ber, "{s[" /*]}*/ , desc->ad_cname->bv_val );
+		rc = ber_printf( ber, "{O[" /*]}*/ , &desc->ad_cname );
 		if ( rc == -1 ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
@@ -911,32 +870,33 @@ send_search_entry(
 			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 );
 			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,
 						   "send_search_entry: conn %d access to %s, value %d not allowed\n",
-						   op->o_connid, desc->ad_cname->bv_val, i ));
+						   op->o_connid, desc->ad_cname.bv_val, i ));
 #else
 					Debug( LDAP_DEBUG_ACL,
 						"acl: access to attribute %s, value %d not allowed\n",
-					desc->ad_cname->bv_val, i, 0 );
+					desc->ad_cname.bv_val, i, 0 );
 #endif
 
 					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",
@@ -946,9 +906,10 @@ send_search_entry(
 					    "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 );
 					goto error_return;
 				}
 			}
@@ -963,9 +924,10 @@ send_search_entry(
 			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 );
 			goto error_return;
 		}
 	}
@@ -974,6 +936,10 @@ send_search_entry(
 
 	rc = ber_printf( ber, /*{{{*/ "}N}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", LDAP_LEVEL_ERR,
@@ -983,14 +949,14 @@ send_search_entry(
 		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
@@ -1036,13 +1002,13 @@ send_search_reference(
     Connection	*conn,
     Operation	*op,
     Entry	*e,
-	struct berval **refs,
-	int scope,
+	BerVarray refs,
 	LDAPControl **ctrls,
-    struct berval ***v2refs
+    BerVarray *v2refs
 )
 {
-	BerElement	*ber;
+	char		berbuf[256];
+	BerElement	*ber = (BerElement *)berbuf;
 	int rc;
 	int bytes;
 
@@ -1051,8 +1017,8 @@ send_search_reference(
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		   "send_search_reference: conn %d  dn=\"%s\"\n",
-		   op->o_connid, e->e_dn ));
+		"send_search_reference: conn %d  dn=\"%s\"\n",
+		op->o_connid, e->e_dn ));
 #else
 	Debug( LDAP_DEBUG_TRACE,
 		"=> send_search_reference: dn=\"%s\"\n",
@@ -1065,8 +1031,8 @@ send_search_reference(
 	{
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-			   "send_search_reference: conn %d	access to entry %s not allowed\n",
-			   op->o_connid, e->e_dn ));
+			"send_search_reference: conn %d	access to entry %s not allowed\n",
+			op->o_connid, e->e_dn ));
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"send_search_reference: access to entry not allowed\n",
@@ -1081,8 +1047,8 @@ send_search_reference(
 	{
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
-			   "send_search_reference: conn %d access to reference not allowed.\n",
-			   op->o_connid ));
+			"send_search_reference: conn %d access to reference not allowed.\n",
+			op->o_connid ));
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"send_search_reference: access to reference not allowed\n",
@@ -1095,8 +1061,8 @@ send_search_reference(
 	if( refs == NULL ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "send_search_reference: null ref in (%s).\n",
-			   op->o_connid, e->e_dn ));
+			"send_search_reference: null ref in (%s).\n",
+			op->o_connid, e->e_dn ));
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"send_search_reference: null ref in (%s)\n", 
@@ -1108,50 +1074,35 @@ send_search_reference(
 
 	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 );
+	ber_init_w_nullc( ber, 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;
-	}
-
-	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 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "send_search_reference: conn %d	ber_printf failed.\n",
-			   op->o_connid ));
+			"send_search_reference: conn %d	ber_printf failed.\n",
+			op->o_connid ));
 #else
 		Debug( LDAP_DEBUG_ANY,
 			"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;
@@ -1159,17 +1110,16 @@ send_search_reference(
 	num_pdu_sent++;
 	ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
 
-	Statslog( LDAP_DEBUG_STATS2, "conn=%ld op=%ld ENTRY dn=\"%s\"\n",
-	    (long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 );
+	Statslog( LDAP_DEBUG_STATS2, "conn=%ld op=%ld REF dn=\"%s\"\n",
+		(long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 );
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		   "send_search_reference: conn %d exit.\n", op->o_connid ));
+		"send_search_reference: conn %d exit.\n", op->o_connid ));
 #else
 	Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
 #endif
 
-
 	return 0;
 }
 
@@ -1227,7 +1177,7 @@ str2result(
 		} 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 );