/* dn.c - routines for dealing with distinguished names */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#include "slap.h"
+const struct berval slap_empty_bv = { 0, "" };
+
#define SLAP_LDAPDN_PRETTY 0x1
/*
assert( dn );
- for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) {
- LDAPRDN *rdn = dn[ iRDN ][ 0 ];
+ for ( iRDN = 0; dn[ 0 ][ iRDN ]; iRDN++ ) {
+ LDAPRDN *rdn = dn[ 0 ][ iRDN ];
int iAVA;
assert( rdn );
- for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) {
- LDAPAVA *ava = rdn[ iAVA ][ 0 ];
+ for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) {
+ LDAPAVA *ava = rdn[ 0 ][ iAVA ];
AttributeDescription *ad;
slap_syntax_validate_func *validate = NULL;
if ( ( ad = AVA_PRIVATE( ava ) ) == NULL ) {
const char *text = NULL;
- rc = slap_bv2ad( ava->la_attr, &ad, &text );
+ rc = slap_bv2ad( &ava->la_attr, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
return LDAP_INVALID_SYNTAX;
}
/*
* Replace attr oid/name with the canonical name
*/
- ber_bvfree( ava->la_attr );
- ava->la_attr = ber_bvdup( &ad->ad_cname );
+ ava->la_attr = ad->ad_cname;
validate = ad->ad_type->sat_syntax->ssyn_validate;
* validate value by validate function
*/
rc = ( *validate )( ad->ad_type->sat_syntax,
- ava->la_value );
+ &ava->la_value );
if ( rc != LDAP_SUCCESS ) {
return LDAP_INVALID_SYNTAX;
*/
if ( rc == LDAP_SUCCESS ) {
rc = LDAPDN_validate( dn );
+ ldap_dnfree( dn );
}
- ldap_dnfree( dn );
-
if ( rc != LDAP_SUCCESS ) {
return( LDAP_INVALID_SYNTAX );
}
* (use memcmp, which implies alphabetical order in case of IA5 value;
* this should guarantee the repeatability of the operation).
*
+ * Note: the sorting can be slightly improved by sorting first
+ * by attribute type length, then by alphabetical order.
+ *
* uses a linear search; should be fine since the number of AVAs in
* a RDN should be limited.
*/
AVA_Sort( LDAPRDN *rdn, int iAVA )
{
int i;
- LDAPAVA *ava_in = rdn[ iAVA ][ 0 ];
+ LDAPAVA *ava_in = rdn[ 0 ][ iAVA ];
assert( rdn );
assert( ava_in );
for ( i = 0; i < iAVA; i++ ) {
- LDAPAVA *ava = rdn[ i ][ 0 ];
+ LDAPAVA *ava = rdn[ 0 ][ i ];
int a, j;
assert( ava );
- a = strcmp( ava_in->la_attr->bv_val, ava->la_attr->bv_val );
+ a = strcmp( ava_in->la_attr.bv_val, ava->la_attr.bv_val );
if ( a > 0 ) {
break;
while ( a == 0 ) {
int v, d;
- d = ava_in->la_value->bv_len - ava->la_value->bv_len;
+ d = ava_in->la_value.bv_len - ava->la_value.bv_len;
- v = memcmp( ava_in->la_value->bv_val,
- ava->la_value->bv_val,
- d <= 0 ? ava_in->la_value->bv_len
- : ava->la_value->bv_len );
+ v = memcmp( ava_in->la_value.bv_val,
+ ava->la_value.bv_val,
+ d <= 0 ? ava_in->la_value.bv_len
+ : ava->la_value.bv_len );
if ( v == 0 && d != 0 ) {
v = d;
return;
}
- ava = rdn[ i ][ 0 ];
- a = strcmp( ava_in->la_value->bv_val,
- ava->la_value->bv_val );
+ ava = rdn[ 0 ][ i ];
+ a = strcmp( ava_in->la_attr.bv_val,
+ ava->la_attr.bv_val );
}
/*
* move ahead
*/
for ( j = iAVA; j > i; j-- ) {
- rdn[ j ][ 0 ] = rdn[ j - 1 ][ 0 ];
+ rdn[ 0 ][ j ] = rdn[ 0 ][ j - 1 ];
}
- rdn[ i ][ 0 ] = ava_in;
+ rdn[ 0 ][ i ] = ava_in;
return;
}
assert( dn );
- for ( iRDN = 0; dn[ iRDN ]; iRDN++ ) {
- LDAPRDN *rdn = dn[ iRDN ][ 0 ];
+ for ( iRDN = 0; dn[ 0 ][ iRDN ]; iRDN++ ) {
+ LDAPRDN *rdn = dn[ 0 ][ iRDN ];
int iAVA;
assert( rdn );
- for ( iAVA = 0; rdn[ iAVA ]; iAVA++ ) {
- LDAPAVA *ava = rdn[ iAVA ][ 0 ];
+ for ( iAVA = 0; rdn[ 0 ][ iAVA ]; iAVA++ ) {
+ LDAPAVA *ava = rdn[ 0 ][ iAVA ];
AttributeDescription *ad;
slap_syntax_transform_func *transf = NULL;
MatchingRule *mr;
- struct berval *bv = NULL;
+ struct berval bv = { 0, NULL };
+ int do_sort = 0;
assert( ava );
if ( ( ad = AVA_PRIVATE( ava ) ) == NULL ) {
const char *text = NULL;
- rc = slap_bv2ad( ava->la_attr, &ad, &text );
+ rc = slap_bv2ad( &ava->la_attr, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
return LDAP_INVALID_SYNTAX;
}
ava->la_private = ( void * )ad;
+ do_sort = 1;
}
/*
* Replace attr oid/name with the canonical name
*/
- ber_bvfree( ava->la_attr );
- ava->la_attr = ber_bvdup( &ad->ad_cname );
+ ava->la_attr = ad->ad_cname;
if( flags & SLAP_LDAPDN_PRETTY ) {
transf = ad->ad_type->sat_syntax->ssyn_pretty;
* transform value by normalize/pretty function
*/
rc = ( *transf )( ad->ad_type->sat_syntax,
- ava->la_value, &bv );
+ &ava->la_value, &bv );
if ( rc != LDAP_SUCCESS ) {
return LDAP_INVALID_SYNTAX;
}
if( mr && ( mr->smr_usage & SLAP_MR_DN_FOLD ) ) {
- struct berval *s = bv;
-
- bv = ber_bvstr( UTF8normalize( bv ? bv : ava->la_value,
- UTF8_CASEFOLD ) );
+ char *s = bv.bv_val;
- ber_bvfree( s );
+ ber_str2bv( UTF8normalize( bv.bv_val ? &bv
+ : &ava->la_value, LDAP_UTF8_CASEFOLD ),
+ 0, 0, &bv );
+ free( s );
}
- if( bv ) {
- ber_bvfree( ava->la_value );
+ if( bv.bv_val ) {
+ free( ava->la_value.bv_val );
ava->la_value = bv;
}
- AVA_Sort( rdn, iAVA );
+ if( do_sort ) AVA_Sort( rdn, iAVA );
}
}
struct berval *val,
struct berval **normalized )
{
- struct berval *out = NULL;
-
- Debug( LDAP_DEBUG_TRACE, ">>> dnNormalize: <%s>\n", val->bv_val, 0, 0 );
+ struct berval *out;
+ int rc;
+
+ assert( normalized && *normalized == NULL );
+
+ out = ch_malloc( sizeof( struct berval ) );
+ rc = dnNormalize2( syntax, val, out );
+ if ( rc != LDAP_SUCCESS )
+ free( out );
+ else
+ *normalized = out;
+ return rc;
+}
+int
+dnNormalize2(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *out )
+{
assert( val );
- assert( normalized );
+ assert( out );
+
+ Debug( LDAP_DEBUG_TRACE, ">>> dnNormalize: <%s>\n", val->bv_val, 0, 0 );
if ( val->bv_len != 0 ) {
LDAPDN *dn = NULL;
- char *dn_out = NULL;
int rc;
/*
/*
* Back to string representation
*/
- rc = ldap_dn2str( dn, &dn_out, LDAP_DN_FORMAT_LDAPV3 );
+ rc = ldap_dn2bv( dn, out, LDAP_DN_FORMAT_LDAPV3 );
ldap_dnfree( dn );
if ( rc != LDAP_SUCCESS ) {
return LDAP_INVALID_SYNTAX;
}
-
- out = ber_bvstr( dn_out );
-
} else {
- out = ber_bvdup( val );
+ ber_dupbv( out, val );
}
Debug( LDAP_DEBUG_TRACE, "<<< dnNormalize: <%s>\n", out->bv_val, 0, 0 );
- *normalized = out;
-
return LDAP_SUCCESS;
}
struct berval *val,
struct berval **pretty)
{
- struct berval *out = NULL;
-
- Debug( LDAP_DEBUG_TRACE, ">>> dnPretty: <%s>\n", val->bv_val, 0, 0 );
+ struct berval *out;
+ int rc;
+
+ assert( pretty && *pretty == NULL );
+
+ out = ch_malloc( sizeof( struct berval ) );
+ rc = dnPretty2( syntax, val, out );
+ if ( rc != LDAP_SUCCESS )
+ free( out );
+ else
+ *pretty = out;
+ return rc;
+}
+int
+dnPretty2(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *out)
+{
assert( val );
- assert( pretty );
+ assert( out );
+
+ Debug( LDAP_DEBUG_TRACE, ">>> dnPretty: <%s>\n", val->bv_val, 0, 0 );
if ( val->bv_len != 0 ) {
LDAPDN *dn = NULL;
- char *dn_out = NULL;
int rc;
/* FIXME: should be liberal in what we accept */
/* RE: the default is the form that is used as
* an internal representation; the pretty form
* is a variant */
- rc = ldap_dn2str( dn, &dn_out,
+ rc = ldap_dn2bv( dn, out,
LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
ldap_dnfree( dn );
if ( rc != LDAP_SUCCESS ) {
return LDAP_INVALID_SYNTAX;
}
-
- out = ber_bvstr( dn_out );
-
} else {
- out = ber_bvdup( val );
+ ber_dupbv( out, val );
}
Debug( LDAP_DEBUG_TRACE, "<<< dnPretty: <%s>\n", out->bv_val, 0, 0 );
- *pretty = out;
+ return LDAP_SUCCESS;
+}
+
+/*
+ * Combination of both dnPretty and dnNormalize
+ */
+int
+dnPrettyNormal(
+ Syntax *syntax,
+ struct berval *val,
+ struct berval *pretty,
+ struct berval *normal)
+{
+ Debug( LDAP_DEBUG_TRACE, ">>> dnPrettyNormal: <%s>\n", val->bv_val, 0, 0 );
+
+ assert( val );
+ assert( pretty );
+ assert( normal );
+
+ if ( val->bv_len != 0 ) {
+ LDAPDN *dn = NULL;
+ int rc;
+
+ pretty->bv_val = NULL;
+ normal->bv_val = NULL;
+ pretty->bv_len = 0;
+ normal->bv_len = 0;
+
+ /* FIXME: should be liberal in what we accept */
+ rc = ldap_str2dn( val->bv_val, &dn, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ /*
+ * Schema-aware rewrite
+ */
+ if ( LDAPDN_rewrite( dn, SLAP_LDAPDN_PRETTY ) != LDAP_SUCCESS ) {
+ ldap_dnfree( dn );
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ rc = ldap_dn2bv( dn, pretty,
+ LDAP_DN_FORMAT_LDAPV3 | LDAP_DN_PRETTY );
+
+ if ( rc != LDAP_SUCCESS ) {
+ ldap_dnfree( dn );
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ if ( LDAPDN_rewrite( dn, 0 ) != LDAP_SUCCESS ) {
+ ldap_dnfree( dn );
+ free( pretty->bv_val );
+ pretty->bv_val = NULL;
+ pretty->bv_len = 0;
+ return LDAP_INVALID_SYNTAX;
+ }
+
+ rc = ldap_dn2bv( dn, normal, LDAP_DN_FORMAT_LDAPV3 );
+
+ ldap_dnfree( dn );
+ if ( rc != LDAP_SUCCESS ) {
+ free( pretty->bv_val );
+ pretty->bv_val = NULL;
+ pretty->bv_len = 0;
+ return LDAP_INVALID_SYNTAX;
+ }
+ } else {
+ ber_dupbv( pretty, val );
+ ber_dupbv( normal, val );
+ }
+
+ Debug( LDAP_DEBUG_TRACE, "<<< dnPrettyNormal: <%s>, <%s>\n",
+ pretty->bv_val, normal->bv_val, 0 );
return LDAP_SUCCESS;
}
/*
- * dn match routine
- *
- * note: uses exact string match (strcmp) because it is supposed to work
- * on normalized DNs.
+ * dnMatch routine
*/
int
dnMatch(
}
/*
- * dn_validate - validate and compress dn. the dn is
- * compressed in place are returned if valid.
+ * dnParent - dn's parent, in-place
+ *
+ * note: the incoming dn is assumed to be normalized/prettyfied,
+ * so that escaped rdn/ava separators are in '\'+hexpair form
*/
-
-char *
-dn_validate( char *dn_in )
+int
+dnParent(
+ struct berval *dn,
+ struct berval *pdn )
{
- struct berval val, *normalized;
- int rc;
-
- if ( dn_in == NULL || dn_in[ 0 ] == '\0' ) {
- return( dn_in );
- }
+ const char *p;
- val.bv_val = dn_in;
- val.bv_len = strlen( dn_in );
+ p = strchr( dn->bv_val, ',' );
- rc = dnPretty( NULL, &val, &normalized );
- if ( rc != LDAP_SUCCESS ) {
- return( NULL );
+ /* one-level dn */
+ if ( p == NULL ) {
+ pdn->bv_val = "";
+ pdn->bv_len = 0;
+ return LDAP_SUCCESS;
}
- if ( val.bv_len < normalized->bv_len ) {
- ber_bvfree( normalized );
- return( NULL );
- }
+ assert( DN_SEPARATOR( p[ 0 ] ) );
+ p++;
- AC_MEMCPY( dn_in, normalized->bv_val, normalized->bv_len + 1 );
- ber_bvfree( normalized );
+ assert( ATTR_LEADCHAR( p[ 0 ] ) );
+ pdn->bv_val = p;
+ pdn->bv_len = dn->bv_len - (p - dn->bv_val);
- return( dn_in );
+ return LDAP_SUCCESS;
}
+#ifdef SLAP_DN_MIGRATION
+/*
+ * these routines are provided for migration purposes only!
+ * dn_normalize is deprecated in favor of dnNormalize
+ * strcmp/strcasecmp for DNs is deprecated in favor of dnMatch
+ *
+ * other routines are likewise deprecated but may not yet have
+ * replacement functions.
+ */
+
/*
* dn_normalize - put dn into a canonical form suitable for storing
* in a hash database. this involves normalizing the case as well as
* the format. the dn is normalized in place as well as returned if valid.
+ * Deprecated in favor of dnNormalize()
*/
-
char *
dn_normalize( char *dn )
{
- struct berval val, *normalized;
+ struct berval val;
+ struct berval *normalized = NULL;
int rc;
- if ( dn == NULL || dn[ 0 ] == '\0' ) {
- return( dn );
+ if ( dn == NULL || dn[0] == '\0' ) {
+ return dn;
}
val.bv_val = dn;
rc = dnNormalize( NULL, &val, &normalized );
if ( rc != LDAP_SUCCESS ) {
- return( NULL );
+ return NULL;
}
if ( val.bv_len < normalized->bv_len ) {
ber_bvfree( normalized );
- return( NULL );
+ return NULL;
}
AC_MEMCPY( dn, normalized->bv_val, normalized->bv_len + 1 );
ber_bvfree( normalized );
- return( dn );
+ return dn;
}
/*
* dn_parent - return the dn's parent, in-place
+ * FIXME: should be replaced by dnParent()
*/
char *
dn_parent(
- Backend *be,
+ Backend *be,
const char *dn )
{
- const char *s;
- int inquote;
+ const char *pdn;
+ struct berval bv;
- if( dn == NULL ) {
+ if ( dn == NULL ) {
return NULL;
}
- while(*dn != '\0' && ASCII_SPACE(*dn)) {
+ while ( dn[ 0 ] != '\0' && ASCII_SPACE( dn[ 0 ] ) ) {
dn++;
}
- if( *dn == '\0' ) {
+ if ( dn[ 0 ] == '\0' ) {
return NULL;
}
- if ( be != NULL && be_issuffix( be, dn ) ) {
+ bv.bv_val = dn;
+ bv.bv_len = strlen(bv.bv_val);
+ if ( be != NULL && be_issuffix( be, &bv ) ) {
return NULL;
}
- /*
- * assume it is an X.500-style name, which looks like
- * foo=bar,sha=baz,...
- */
-
- inquote = 0;
- for ( s = dn; *s; s++ ) {
- if ( *s == '\\' ) {
- if ( *(s + 1) ) {
- s++;
- }
- continue;
- }
- if ( inquote ) {
- if ( *s == '"' ) {
- inquote = 0;
- }
- } else {
- if ( *s == '"' ) {
- inquote = 1;
- } else if ( DN_SEPARATOR( *s ) ) {
- return (char *)s + 1;
- }
- }
+ if ( dnParent( dn, &pdn ) != LDAP_SUCCESS ) {
+ return NULL;
}
-
- return "";
+
+ return ( char * )pdn;
}
+#endif /* SLAP_DN_MIGRATION */
-int dn_rdnlen(
- Backend *be,
- const char *dn_in )
-{
- char *s;
- int inquote;
- if( dn_in == NULL ) {
- return 0;
- }
+int
+dnExtractRdn(
+ struct berval *dn,
+ struct berval *rdn )
+{
+ LDAPRDN *tmpRDN;
+ const char *p;
+ int rc;
- while(*dn_in && ASCII_SPACE(*dn_in)) {
- dn_in++;
- }
+ assert( dn );
+ assert( rdn );
- if( *dn_in == '\0' ) {
- return( 0 );
+ if( dn->bv_len == 0 ) {
+ return LDAP_OTHER;
}
- if ( be != NULL && be_issuffix( be, dn_in ) ) {
- return( 0 );
+ rc = ldap_str2rdn( dn->bv_val, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
}
- inquote = 0;
-
- for ( s = (char *)dn_in; *s; s++ ) {
- if ( *s == '\\' ) {
- if ( *(s + 1) ) {
- s++;
- }
- continue;
- }
- if ( inquote ) {
- if ( *s == '"' ) {
- inquote = 0;
- }
- } else {
- if ( *s == '"' ) {
- inquote = 1;
- } else if ( DN_SEPARATOR( *s ) ) {
- break;
- }
- }
+ rc = ldap_rdn2bv( tmpRDN, rdn, LDAP_DN_FORMAT_LDAPV3 );
+ ldap_rdnfree( tmpRDN );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
}
- return( s - dn_in );
-}
-
-char * dn_rdn(
- Backend *be,
- const char *dn_in )
-{
- char *rdn;
- int i = dn_rdnlen( be, dn_in );
-
- rdn = ch_malloc( i + 1 );
- strncpy(rdn, dn_in, i);
- rdn[i] = '\0';
- return rdn;
+ return LDAP_SUCCESS;
}
/*
- * return a charray of all subtrees to which the DN resides in
+ * We can assume the input is a prettied or normalized DN
*/
-char **dn_subtree(
- Backend *be,
- const char *dn )
-{
- char **subtree = NULL;
-
- do {
- charray_add( &subtree, dn );
-
- dn = dn_parent( be, dn );
-
- } while ( dn != NULL );
-
- return subtree;
-}
-
-
-int
-dn_issuffixbv(
- const struct berval *dn,
- const struct berval *suffix
-)
+int
+dn_rdnlen(
+ Backend *be,
+ struct berval *dn_in )
{
- int d = dn->bv_len - suffix->bv_len;
-
- assert( dn );
- assert( suffix );
+ int rc;
+ const char *p;
- /* empty suffix matches any dn */
- if ( suffix->bv_len == 0 ) {
- return 1;
- }
+ assert( dn_in );
- /* suffix longer than dn */
- if ( d < 0 ) {
+ if ( dn_in == NULL ) {
return 0;
}
- /* no rdn separator or escaped rdn separator */
- if ( d > 1 && ( !DN_SEPARATOR( dn->bv_val[ d - 1 ] )
- || DN_ESCAPE( dn->bv_val[ d - 2 ] ) ) ) {
+ if ( !dn_in->bv_len ) {
return 0;
}
- /* no possible match or malformed dn */
- if ( d == 1 ) {
+ if ( be != NULL && be_issuffix( be, dn_in ) ) {
return 0;
}
- /* compare */
- return( strcmp( dn->bv_val + d, suffix->bv_val ) == 0 );
-}
-
-/*
- * dn_issuffix - tells whether suffix is a suffix of dn. Both dn
- * and suffix must be normalized.
- */
-
-int
-dn_issuffix(
- const char *dn,
- const char *suffix
-)
-{
- struct berval bvdn, bvsuffix;
+ p = strchr( dn_in->bv_val, ',' );
- assert( dn );
- assert( suffix );
-
- bvdn.bv_val = (char *) dn;
- bvdn.bv_len = strlen( dn );
- bvsuffix.bv_val = (char *) suffix;
- bvsuffix.bv_len = strlen( suffix );
-
- return dn_issuffixbv( &bvdn, &bvsuffix );
+ return p ? p - dn_in->bv_val : dn_in->bv_len;
}
-/*
- * get_next_substring(), rdn_attr_type(), rdn_attr_value(), and
- * build_new_dn().
- *
- * Copyright 1999, Juan C. Gomez, All rights reserved.
- * This software is not subject to any license of Silicon Graphics
- * Inc. or Purdue University.
- *
- * Redistribution and use in source and binary forms are permitted
- * without restriction or fee of any kind as long as this notice
- * is preserved.
- *
- */
-/* get_next_substring:
+/* rdnValidate:
*
- * Gets next substring in s, using d (or the end of the string '\0') as a
- * string delimiter, and places it in a duplicated memory space. Leading
- * spaces are ignored. String s **must** be null-terminated.
+ * LDAP_SUCCESS if rdn is a legal rdn;
+ * LDAP_INVALID_SYNTAX otherwise (including a sequence of rdns)
*/
-
-static char *
-get_next_substring( const char * s, char d )
+int
+rdnValidate( struct berval *rdn )
{
-
- char *str, *r;
-
- r = str = ch_malloc( strlen(s) + 1 );
-
- /* Skip leading spaces */
-
- while ( *s && ASCII_SPACE(*s) ) {
- s++;
+#if 1
+ /* Major cheat!
+ * input is a pretty or normalized DN
+ * hence, we can just search for ','
+ */
+ if( rdn == NULL || rdn->bv_len == 0 ) {
+ return LDAP_INVALID_SYNTAX;
}
-
- /* Copy word */
- while ( *s && (*s != d) ) {
+ return strchr( rdn->bv_val, ',' ) == NULL
+ ? LDAP_SUCCESS : LDAP_INVALID_SYNTAX;
- /* Don't stop when you see trailing spaces may be a multi-word
- * string, i.e. name=John Doe!
- */
+#else
+ LDAPRDN *RDN, **DN[ 2 ] = { &RDN, NULL };
+ const char *p;
+ int rc;
- *str++ = *s++;
+ /*
+ * must be non-empty
+ */
+ if ( rdn == NULL || rdn == '\0' ) {
+ return 0;
}
-
- *str = '\0';
-
- return r;
-
-}
-
-
-/* rdn_attr_type:
- *
- * Given a string (i.e. an rdn) of the form:
- * "attribute_type = attribute_value"
- * this function returns the type of an attribute, that is the
- * string "attribute_type" which is placed in newly allocated
- * memory. The returned string will be null-terminated.
- */
-
-char * rdn_attr_type( const char * s )
-{
- return get_next_substring( s, '=' );
-}
+ /*
+ * must be parsable
+ */
+ rc = ldap_str2rdn( rdn, &RDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
+ if ( rc != LDAP_SUCCESS ) {
+ return 0;
+ }
-/* rdn_attr_value:
- *
- * Given a string (i.e. an rdn) of the form:
- * "attribute_type = attribute_value"
- * this function returns "attribute_type" which is placed in newly allocated
- * memory. The returned string will be null-terminated and may contain
- * spaces (i.e. "John Doe\0").
- */
-
-char *
-rdn_attr_value( const char * rdn )
-{
-
- const char *str;
-
- if ( (str = strchr( rdn, '=' )) != NULL ) {
- return get_next_substring(++str, '\0');
+ /*
+ * Must be one-level
+ */
+ if ( p[ 0 ] != '\0' ) {
+ return 0;
}
- return NULL;
+ /*
+ * Schema-aware validate
+ */
+ if ( rc == LDAP_SUCCESS ) {
+ rc = LDAPDN_validate( DN );
+ }
+ ldap_rdnfree( RDN );
+ /*
+ * Must validate (there's a repeated parsing ...)
+ */
+ return ( rc == LDAP_SUCCESS );
+#endif
}
-/* rdn_attrs:
+/* build_new_dn:
*
- * Given a string (i.e. an rdn) of the form:
- * "attribute_type=attribute_value[+attribute_type=attribute_value[...]]"
- * this function stores the types of the attributes in ptypes, that is the
- * array of strings "attribute_type" which is placed in newly allocated
- * memory, and the values of the attributes in pvalues, that is the
- * array of strings "attribute_value" which is placed in newly allocated
- * memory. Returns 0 on success, -1 on failure.
+ * Used by ldbm/bdb2 back_modrdn to create the new dn of entries being
+ * renamed.
*
- * note: got part of the code from dn_validate
+ * new_dn = parent (p_dn) + separator + rdn (newrdn) + null.
*/
-int
-rdn_attrs( const char * rdn_in, char ***ptypes, char ***pvalues)
+void
+build_new_dn( struct berval * new_dn,
+ struct berval * parent_dn,
+ struct berval * newrdn )
{
- char **parts, **p;
-
- *ptypes = NULL;
- *pvalues = NULL;
+ char *ptr;
- /*
- * explode the rdn in parts
- */
- parts = ldap_explode_rdn( rdn_in, 0 );
-
- if ( parts == NULL ) {
- return( -1 );
- }
-
- for ( p = parts; p[0]; p++ ) {
- char *s, *e, *d;
-
- /* split each rdn part in type value */
- s = strchr( p[0], '=' );
- if ( s == NULL ) {
- charray_free( *ptypes );
- charray_free( *pvalues );
- charray_free( parts );
- return( -1 );
- }
-
- /* type should be fine */
- charray_add_n( ptypes, p[0], ( s-p[0] ) );
-
- /* value needs to be unescaped
- * (maybe this should be moved to ldap_explode_rdn?) */
- for ( e = d = s + 1; e[0]; e++ ) {
- if ( *e != '\\' ) {
- *d++ = *e;
- }
- }
- d[0] = '\0';
- charray_add( pvalues, s + 1 );
+ if ( parent_dn == NULL ) {
+ ber_dupbv( new_dn, newrdn );
+ return;
}
- /* free array */
- charray_free( parts );
+ new_dn->bv_len = parent_dn->bv_len + newrdn->bv_len + 1;
+ new_dn->bv_val = (char *) ch_malloc( new_dn->bv_len + 1 );
- return( 0 );
+ ptr = slap_strcopy( new_dn->bv_val, newrdn->bv_val );
+ *ptr++ = ',';
+ strcpy( ptr, parent_dn->bv_val );
}
-/* rdn_validate:
- *
- * 1 if rdn is a legal rdn;
- * 0 otherwise (including a sequence of rdns)
- *
- * note: got it from dn_rdn; it should be rewritten
- * according to dn_validate
+/*
+ * dnIsSuffix - tells whether suffix is a suffix of dn.
+ * Both dn and suffix must be normalized.
*/
int
-rdn_validate( const char * rdn )
+dnIsSuffix(
+ const struct berval *dn,
+ const struct berval *suffix )
{
- int inquote;
-
- if ( rdn == NULL ) {
- return( 0 );
- }
+ int d = dn->bv_len - suffix->bv_len;
- if ( strchr( rdn, '=' ) == NULL ) {
- return( 0 );
- }
+ assert( dn );
+ assert( suffix );
- while ( *rdn && ASCII_SPACE( *rdn ) ) {
- rdn++;
+ /* empty suffix matches any dn */
+ if ( suffix->bv_len == 0 ) {
+ return 1;
}
- if( *rdn == '\0' ) {
- return( 0 );
+ /* suffix longer than dn */
+ if ( d < 0 ) {
+ return 0;
}
- inquote = 0;
-
- for ( ; *rdn; rdn++ ) {
- if ( *rdn == '\\' ) {
- if ( *(rdn + 1) ) {
- rdn++;
- }
- continue;
- }
- if ( inquote ) {
- if ( *rdn == '"' ) {
- inquote = 0;
- }
- } else {
- if ( *rdn == '"' ) {
- inquote = 1;
- } else if ( DN_SEPARATOR( *rdn ) ) {
- return( 0 );
- }
- }
+ /* no rdn separator or escaped rdn separator */
+ if ( d > 1 && !DN_SEPARATOR( dn->bv_val[ d - 1 ] ) ) {
+ return 0;
}
- return( 1 );
-}
-
-
-/* build_new_dn:
- *
- * Used by ldbm/bdb2 back_modrdn to create the new dn of entries being
- * renamed.
- *
- * new_dn = parent (p_dn) + separator(s) + rdn (newrdn) + null.
- */
-
-void
-build_new_dn( char ** new_dn,
- const char *e_dn,
- const char * p_dn,
- const char * newrdn )
-{
-
- if ( p_dn == NULL ) {
- *new_dn = ch_strdup( newrdn );
- return;
+ /* no possible match or malformed dn */
+ if ( d == 1 ) {
+ return 0;
}
- *new_dn = (char *) ch_malloc( strlen( p_dn ) + strlen( newrdn ) + 3 );
-
- strcpy( *new_dn, newrdn );
- strcat( *new_dn, "," );
- strcat( *new_dn, p_dn );
+ /* compare */
+ return( strcmp( dn->bv_val + d, suffix->bv_val ) == 0 );
}
projects / openldap / blobdiff