mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

for consistency, always represent UUIDs correctly (ITS#5168; really, a de-normalize hook would help)

Browse Source
This commit is contained in:
Pierangelo Masarati 2007-10-05 08:24:36 +00:00
parent 55a988831a
commit f7d274e672
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servers/slapd/filter.c
View File

@ -32,6 +32,7 @@
#include <ac/string.h> #include <ac/string.h>
#include "slap.h" #include "slap.h"
#include "lutil.h"
const Filter *slap_filter_objectClass_pres; const Filter *slap_filter_objectClass_pres;
const struct berval *slap_filterstr_objectClass_pres; const struct berval *slap_filterstr_objectClass_pres;
@ -567,6 +568,7 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
int i; int i;
Filter *p; Filter *p;
struct berval tmp; struct berval tmp;
char uuid[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
static struct berval static struct berval
ber_bvfalse = BER_BVC( "(?=false)" ), ber_bvfalse = BER_BVC( "(?=false)" ),
ber_bvtrue = BER_BVC( "(?=true)" ), ber_bvtrue = BER_BVC( "(?=true)" ),
@ -591,6 +593,13 @@ filter2bv_x( Operation *op, Filter *f, struct berval *fstr )
case LDAP_FILTER_EQUALITY: case LDAP_FILTER_EQUALITY:
fstr->bv_len = STRLENOF("(=)"); fstr->bv_len = STRLENOF("(=)");
sign = "="; sign = "=";
if ( f->f_av_desc->ad_type->sat_syntax == slap_schema.si_ad_entryUUID->ad_type->sat_syntax ) {
tmp.bv_len = lutil_uuidstr_from_normalized( f->f_av_value.bv_val,
f->f_av_value.bv_len, uuid, LDAP_LUTIL_UUIDSTR_BUFSIZE );
assert( tmp.bv_len > 0 );
tmp.bv_val = uuid;
goto escaped;
}
goto simple; goto simple;
case LDAP_FILTER_GE: case LDAP_FILTER_GE:
fstr->bv_len = STRLENOF("(>=)"); fstr->bv_len = STRLENOF("(>=)");
@ -611,6 +620,7 @@ simple:
* to have been normalized, meaning that an empty value * to have been normalized, meaning that an empty value
* is legal for that attribute's syntax */ * is legal for that attribute's syntax */
escaped:
fstr->bv_len += f->f_av_desc->ad_cname.bv_len + tmp.bv_len; fstr->bv_len += f->f_av_desc->ad_cname.bv_len + tmp.bv_len;
if ( undef ) if ( undef )
fstr->bv_len++; fstr->bv_len++;