From 9ca53f98edcf48336da88a5371e6f2d59bbeca51 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Thu, 6 Mar 2008 23:30:54 +0000 Subject: [PATCH] fix attribute description parsing (ITS#5402) --- servers/slapd/sets.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c index 7f3f8ceba8..d7c56fa9ed 100644 --- a/servers/slapd/sets.c +++ b/servers/slapd/sets.c @@ -709,20 +709,19 @@ slap_set_filter( SLAP_SET_GATHER gatherer, break; default: - if ( ( c != '_' ) - && ( c < 'A' || c > 'Z' ) - && ( c < 'a' || c > 'z' ) ) - { + if ( !AD_LEADCHAR( c ) ) { SF_ERROR( syntax ); } filter--; for ( len = 1; - ( c = filter[ len ] ) - && ( ( c >= '0' && c <= '9' ) - || ( c >= 'A' && c <= 'Z' ) - || ( c >= 'a' && c <= 'z' ) ); - len++ ) - /* count */ ; + ( c = filter[ len ] ) && AD_CHAR( c ); + len++ ) + { + /* count */ + if ( c == '-' && !AD_CHAR( filter[ len + 1 ] ) ) { + break; + } + } if ( len == 4 && memcmp( "this", filter, len ) == 0 ) { -- 2.39.5