/* limits.c - routines to handle regex-based size and time limits */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
if ( ndn->bv_len == 0 ) {
break;
}
- if ( strcmp( lm[0]->lm_dn_pat->bv_val, ndn->bv_val ) == 0 ) {
+ if ( dn_match( &lm[0]->lm_dn_pat, ndn ) ) {
*limit = &lm[0]->lm_limits;
return( 0 );
}
break;
}
- d = ndn->bv_len - lm[0]->lm_dn_pat->bv_len;
+ d = ndn->bv_len - lm[0]->lm_dn_pat.bv_len;
/* ndn shorter than dn_pat */
if ( d < 0 ) {
break;
}
} else {
/* check for unescaped rdn separator */
- if ( !DN_SEPARATOR( ndn->bv_val[d-1] )
- || DN_ESCAPE( ndn->bv_val[d-2] ) )
- {
+ if ( !DN_SEPARATOR( ndn->bv_val[d-1] ) ) {
break;
}
}
/* in case of (sub)match ... */
- if ( strcmp( lm[0]->lm_dn_pat->bv_val, &ndn->bv_val[d] ) == 0 ) {
+ if ( lm[0]->lm_dn_pat.bv_len == ( ndn->bv_len - d )
+ && strcmp( lm[0]->lm_dn_pat.bv_val, &ndn->bv_val[d] ) == 0 ) {
/* check for exactly one rdn in case of ONE */
if ( lm[0]->lm_type == SLAP_LIMITS_ONE ) {
/*
struct berval bv;
bv.bv_val = (char *) pattern;
bv.bv_len = strlen( pattern );
- lm->lm_dn_pat = NULL;
- rc = dnNormalize( NULL, &bv, &lm->lm_dn_pat );
+ rc = dnNormalize2( NULL, &bv, &lm->lm_dn_pat );
if ( rc != LDAP_SUCCESS ) {
ch_free( lm );
return( -1 );
case SLAP_LIMITS_REGEX:
case SLAP_LIMITS_UNDEFINED:
lm->lm_type = SLAP_LIMITS_REGEX;
- lm->lm_dn_pat = ber_bvstrdup( pattern );
- if ( regcomp( &lm->lm_dn_regex, lm->lm_dn_pat->bv_val,
+ ber_str2bv( pattern, 0, 1, &lm->lm_dn_pat );
+ if ( regcomp( &lm->lm_dn_regex, lm->lm_dn_pat.bv_val,
REG_EXTENDED | REG_ICASE ) ) {
- ber_bvfree( lm->lm_dn_pat );
+ free( lm->lm_dn_pat.bv_val );
ch_free( lm );
return( -1 );
}
case SLAP_LIMITS_ANONYMOUS:
case SLAP_LIMITS_USERS:
lm->lm_type = type;
- lm->lm_dn_pat = NULL;
+ lm->lm_dn_pat.bv_val = NULL;
+ lm->lm_dn_pat.bv_len = 0;
break;
}