need this outside for back monitor ...

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 2ecc54369d76e9dfceb325ca084a1005288ee0df..de3ae7dbac2de9706811fba8ab8bf926f854c907 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1,7 +1,7 @@
 /* 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
  */
 
@@ -49,14 +49,14 @@ LDAPDN_validate( LDAPDN *dn )
 
        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;
 
@@ -76,8 +76,7 @@ LDAPDN_validate( LDAPDN *dn )
                        /* 
                         * Replace attr oid/name with the canonical name
                         */
-                       free( ava->la_attr.bv_val );
-                       ber_dupbv( &ava->la_attr, &ad->ad_cname );
+                       ava->la_attr = ad->ad_cname;
 
                        validate = ad->ad_type->sat_syntax->ssyn_validate;
 
@@ -147,13 +146,13 @@ static void
 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 );
@@ -192,7 +191,7 @@ AVA_Sort( LDAPRDN *rdn, int iAVA )
                                return;
                        }
 
-                       ava = rdn[ i ][ 0 ];
+                       ava = rdn[ 0 ][ i ];
                        a = strcmp( ava_in->la_value.bv_val, 
                                        ava->la_value.bv_val );
                }
@@ -201,9 +200,9 @@ AVA_Sort( LDAPRDN *rdn, int iAVA )
                 * 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;
        }
@@ -221,18 +220,19 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
 
        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;
+                       struct berval           bv = { 0, NULL };
+                       int                     do_sort = 0;
 
                        assert( ava );
 
@@ -245,13 +245,13 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
                                }
                                
                                ava->la_private = ( void * )ad;
+                               do_sort = 1;
                        }
 
                        /* 
                         * Replace attr oid/name with the canonical name
                         */
-                       free( ava->la_attr.bv_val );
-                       ber_dupbv( &ava->la_attr, &ad->ad_cname );
+                       ava->la_attr = ad->ad_cname;
 
                        if( flags & SLAP_LDAPDN_PRETTY ) {
                                transf = ad->ad_type->sat_syntax->ssyn_pretty;
@@ -277,7 +277,7 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
                                char *s = bv.bv_val;
 
                                ber_str2bv( UTF8normalize( bv.bv_val ? &bv
-                                       : &ava->la_value, UTF8_CASEFOLD ),
+                                       : &ava->la_value, LDAP_UTF8_CASEFOLD ),
                                        0, 0, &bv );
                                free( s );
                        }
@@ -287,7 +287,7 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
                                ava->la_value = bv;
                        }
 
-                       AVA_Sort( rdn, iAVA );
+                       if( do_sort ) AVA_Sort( rdn, iAVA );
                }
        }
 
@@ -646,11 +646,18 @@ dnParent(
        const char      *p;
        int             rc;
 
-       rc = ldap_str2rdn( dn, NULL, &p, LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP );
+       rc = ldap_str2rdn( dn, NULL, (char **)&p,
+               LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP );
        if ( rc != LDAP_SUCCESS ) {
                return rc;
        }
 
+       /* Parent is root */
+       if (*p == '\0') {
+               *pdn = "";
+               return LDAP_SUCCESS;
+       }
+
        assert( DN_SEPARATOR( p[ 0 ] ) );
        p++;
 
@@ -713,7 +720,7 @@ dnExtractRdn(
                return LDAP_OTHER;
        }
 
-       rc = ldap_str2rdn( dn->bv_val, &tmpRDN, &p, LDAP_DN_FORMAT_LDAP );
+       rc = ldap_str2rdn( dn->bv_val, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
        if ( rc != LDAP_SUCCESS ) {
                return rc;
        }
@@ -752,7 +759,7 @@ dn_rdnlen(
                return 0;
        }
 
-       rc = ldap_str2rdn( dn_in->bv_val, NULL, &p, 
+       rc = ldap_str2rdn( dn_in->bv_val, NULL, (char **)&p, 
                        LDAP_DN_FORMAT_LDAP | LDAP_DN_SKIP );
        if ( rc != LDAP_SUCCESS ) {
                return 0;
@@ -898,7 +905,7 @@ rdn_attrs( const char * rdn, char ***types, char ***values)
        assert( *values == NULL );
        assert( types == NULL || *types == NULL );
 
-       rc = ldap_str2rdn( rdn, &tmpRDN, &p, LDAP_DN_FORMAT_LDAP );
+       rc = ldap_str2rdn( rdn, &tmpRDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
        if ( rc != LDAP_SUCCESS ) {
                return rc;
        }
@@ -913,8 +920,8 @@ rdn_attrs( const char * rdn, char ***types, char ***values)
        }
 #endif
 
-       for ( iAVA = 0; tmpRDN[ iAVA ]; iAVA++ ) {
-               LDAPAVA         *ava = tmpRDN[ iAVA ][ 0 ];
+       for ( iAVA = 0; tmpRDN[ 0 ][ iAVA ]; iAVA++ ) {
+               LDAPAVA         *ava = tmpRDN[ 0 ][ iAVA ];
 
                assert( ava );
                assert( ava->la_attr.bv_val );
@@ -969,7 +976,7 @@ rdnValidate( struct berval *rdn )
        /*
         * must be parsable
         */
-       rc = ldap_str2rdn( rdn, &RDN, &p, LDAP_DN_FORMAT_LDAP );
+       rc = ldap_str2rdn( rdn, &RDN, (char **)&p, LDAP_DN_FORMAT_LDAP );
        if ( rc != LDAP_SUCCESS ) {
                return 0;
        }