add extra level of parens only if required

[openldap] / servers / slapd / back-sql / search.c

diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c
index 241185523f656108a5252641262b1603a2cad5c7..56538aa4a1858f4285aec174f0b89bf5cb66a25d 100644 (file)
--- 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 );