From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 13 Jan 2004 00:33:14 +0000 (+0000)
Subject: add extra level of parens only if required
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~35
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=92a05ccf74156010489835a83b9e09203335bcbf;p=openldap

add extra level of parens only if required
---

diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index 241185523f..56538aa4a1 100644
--- a/servers/slapd/back-sql/search.c
+++ b/servers/slapd/back-sql/search.c
@@ -499,7 +499,12 @@ filter_oc_success:;
 #endif
 	}
 
-	backsql_strfcat( &bsi->bsi_flt_where, "c", '(' );
+	/* apply extra level of parens only if required */
+	done = 0;
+	if ( at->bam_next ) {
+		backsql_strfcat( &bsi->bsi_flt_where, "c", '(' );
+		done = 1;
+	}
 next:;
 	if ( backsql_process_filter_attr( bsi, f, at ) == -1 ) {
 		return -1;
@@ -511,7 +516,9 @@ next:;
 		at = at->bam_next;
 		goto next;
 	}
-	backsql_strfcat( &bsi->bsi_flt_where, "c", ')' );
+	if ( done ) {
+		backsql_strfcat( &bsi->bsi_flt_where, "c", ')' );
+	}
 
 done:;
 	Debug( LDAP_DEBUG_TRACE, "<==backsql_process_filter()\n", 0, 0, 0 );