fix extended matching when rule is missing (ITS#3216)

diff --git a/CHANGES b/CHANGES
index 72510901b86ae07083494848f7a1e814ebc5f296..1e6f36d1b529a9f60f878fa5429463db1c4547db 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,7 @@ OpenLDAP 2.2.15 Engineering
        Fixed slapd group ACL locking bug (ITS#3173)
        Fixed slapi slapi_int_compute_output_ber attrs bug
        Fixed libldap sasl_encode 64-bit bug (ITS#3054,3212)
-       Fixed libldap matchedValues parsing bug (ITS#3208)
+       Fixed libldap matchedValues parsing bug (ITS#3208,3216)
        Fixed libldap_r runqueue bug
        Build environments
                Added additional res_query detection for MacOS X

diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index b1468d047b842f70988f7a9b4045049302e4a626..9a432cb8782bef7830ffa2386c70c1ce5cd679f7 100644 (file)
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.c
@@ -1090,7 +1090,6 @@ put_simple_vrFilter(
 
                {
                        char *rule = strchr( str, ':' );
-                       *rule++ = '\0';
 
                        if( rule == NULL ) {
                                /* must have attribute */
@@ -1098,6 +1097,8 @@ put_simple_vrFilter(
                                        goto done;
                                }
                                rule = "";
+                       } else {
+                               *rule++ = '\0';
                        }
 
                        if ( *str == '\0' && ( !rule || *rule == '\0' ) ) {