X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fresult.c;h=e23f9b43682a033ab8f9ae1fca968acbc7d3ca2a;hb=27cb98d28d60b1f258ea12852b22bfdfec6380f6;hp=863547f206b5646e73b1ffa940486d68ef557151;hpb=b0dfd89e1b66279eb7dfe06a35ef12605b3db06e;p=openldap

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 863547f206..e23f9b4368 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -213,7 +213,7 @@ send_ldap_response(
 	LDAPControl **ctrls
 )
 {
-	char berbuf[256];
+	char berbuf[LBER_ELEMENT_SIZEOF];
 	BerElement	*ber = (BerElement *)berbuf;
 	int		rc;
 	long	bytes;
@@ -224,8 +224,6 @@ send_ldap_response(
 		return;
 	}
 		
-	assert( ctrls == NULL ); /* ctrls not implemented */
-
 	ber_init_w_nullc( ber, LBER_USE_DER );
 
 #ifdef NEW_LOGGING
@@ -252,8 +250,9 @@ send_ldap_response(
 	}
 
 #ifdef LDAP_CONNECTIONLESS
-	if (conn->c_is_udp) {
-	    rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
+	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, 
@@ -656,7 +655,7 @@ send_search_entry(
 	LDAPControl **ctrls
 )
 {
-	char		berbuf[256];
+	char berbuf[LBER_ELEMENT_SIZEOF];
 	BerElement	*ber = (BerElement *)berbuf;
 	Attribute	*a, *aa;
 	int		i, j, rc=-1, bytes;
@@ -711,17 +710,18 @@ send_search_entry(
 
 #ifdef LDAP_CONNECTIONLESS
 	if (conn->c_is_udp) {
-	    rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
+	    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 );
+			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 );
+			Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
 #endif
-		ber_free_buf( ber );
-		return( 1 );
+			ber_free_buf( ber );
+			return( 1 );
 	    }
 	}
 	if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
@@ -1127,8 +1127,9 @@ send_search_entry(
 	}
 
 #ifdef LDAP_CONNECTIONLESS
-	if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1)
+	if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1) {
 		rc = ber_printf( ber, "}" );
+	}
 #endif
 	if ( rc == -1 ) {
 #ifdef NEW_LOGGING
@@ -1145,7 +1146,7 @@ send_search_entry(
 		return( 1 );
 	}
 
-	bytes = send_ldap_ber( conn, ber );
+	bytes = op->o_noop ? 0 : send_ldap_ber( conn, ber );
 	ber_free_buf( ber );
 
 	if ( bytes < 0 ) {
@@ -1196,7 +1197,7 @@ send_search_reference(
     BerVarray *v2refs
 )
 {
-	char		berbuf[256];
+	char berbuf[LBER_ELEMENT_SIZEOF];
 	BerElement	*ber = (BerElement *)berbuf;
 	int rc;
 	int bytes;
@@ -1301,7 +1302,7 @@ send_search_reference(
 		return -1;
 	}
 
-	bytes = send_ldap_ber( conn, ber );
+	bytes = op->o_noop ? 0 : send_ldap_ber( conn, ber );
 	ber_free_buf( ber );
 
 	ldap_pvt_thread_mutex_lock( &num_sent_mutex );