From 651ce221ecceda35db714de2e975ba87eb4098d7 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 3 Jul 2004 11:32:07 +0000 Subject: [PATCH] fix extended matching when rule is missing (ITS#3216) --- CHANGES | 2 +- libraries/libldap/filter.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 72510901b8..1e6f36d1b5 100644 --- 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 b1468d047b..9a432cb878 100644 --- 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' ) ) { -- 2.39.5