compute absolute t/f filter

diff --git a/CHANGES b/CHANGES
index 6e95e9d6cdc180254afe80738afb9b2560bbd94c..b8a30a4aace8fd641e4030a8ba34acb4ffaee167 100644 (file)
--- 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 c29b86f2acca3b59ae6ce82bd552022c52d6ecbb..f32bf4dc2b6615cdfb38ac6b932267701cc25c29 100644 (file)
--- 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: