From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 5 May 2003 18:37:15 +0000 (+0000)
Subject: compute absolute t/f filter
X-Git-Tag: OPENLDAP_REL_ENG_2_1_18~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dda7a9971c9cae1c9bd9d7e69780093ed3d0e6d;p=thirdparty%2Fopenldap.git

compute absolute t/f filter
---

diff --git a/CHANGES b/CHANGES
index 6e95e9d6cd..b8a30a4aac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,8 @@ OpenLDAP 2.1.18 Engineering
 	Fixed liblber multi-value decode bug (ITS#2458)
 	Fixed liblber over read bug (ITS#2465)
 	Fixed ldappasswd -y support (ITS#2441)
+	Documentation
+		Misc man page updates
 
 OpenLDAP 2.1.17 Release
 	Fixed libldap_r thread pool context bug (ITS#2404)
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index c29b86f2ac..f32bf4dc2b 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -207,6 +207,10 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
+		if ( f->f_and == NULL ) {
+			f->f_choice = SLAPD_FILTER_COMPUTED;
+			f->f_result = LDAP_COMPARE_TRUE;
+		}
 		break;
 
 	case LDAP_FILTER_OR:
@@ -220,6 +224,10 @@ get_filter(
 		if ( err != LDAP_SUCCESS ) {
 			break;
 		}
+		if ( f->f_or == NULL ) {
+			f->f_choice = SLAPD_FILTER_COMPUTED;
+			f->f_result = LDAP_COMPARE_FALSE;
+		}
 		break;
 
 	case LDAP_FILTER_NOT: