Commit of the Proxy Cache contribution (ITS#2062)

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 4f438114548ce75a01c5f4e2bf0544c807bb807c..2e412aeb5f52eb1f6e14629d3ca1187446f98f2b 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -328,6 +328,12 @@ send_ldap_response(
                rc = ber_printf( ber, /*"{"*/ "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
                LDAP_LOG( OPERATION, ERR, 
@@ -1250,6 +1256,11 @@ slap_send_search_entry(
                rc = send_ldap_controls( ber, ctrls );
        }
 
+#ifdef LDAP_CONNECTIONLESS
+       if( conn->c_is_udp && op->o_protocol == LDAP_VERSION2 ) {
+               ; /* empty, skip following if */
+       } else
+#endif
        if( rc != -1 ) {
                rc = ber_printf( ber, /*{*/ "N}" );
        }