attr_merge fix; cleanup

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 69ca9f143980188a27a6014b8e7fa686f0af4278..e07786d97fea2a28c5e6fa230b13f20233ddd971 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -60,33 +60,39 @@ attrs_free( Attribute *a )
        }
 }
 
-Attribute *attr_dup( Attribute *a )
+Attribute *
+attr_dup( Attribute *a )
 {
        Attribute *tmp;
 
-       if( a == NULL) return NULL;
+       if ( a == NULL) return NULL;
 
        tmp = ch_malloc( sizeof(Attribute) );
 
-       if( a->a_vals != NULL ) {
+       if ( a->a_vals != NULL ) {
                int i;
 
-               for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
+               for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
                        /* EMPTY */ ;
                }
 
-               tmp->a_vals = ch_malloc((i+1) * sizeof(struct berval));
-               for( i=0; a->a_vals[i].bv_val != NULL; i++ ) {
+               tmp->a_vals = ch_malloc( (i + 1) * sizeof(struct berval) );
+               for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
                        ber_dupbv( &tmp->a_vals[i], &a->a_vals[i] );
-                       if( tmp->a_vals[i].bv_val == NULL ) break;
+                       if ( BER_BVISNULL( &tmp->a_vals[i] ) ) break;
+                       /* FIXME: error? */
                }
                tmp->a_vals[i].bv_val = NULL;
 
-               if( a->a_nvals != a->a_vals ) {
-                       tmp->a_nvals = ch_malloc((i+1) * sizeof(struct berval));
-                       for( i=0; a->a_nvals[i].bv_val != NULL; i++ ) {
+               /* a_nvals must be non null; it may be equal to a_vals */
+               assert( a->a_nvals );
+
+               if ( a->a_nvals != a->a_vals ) {
+                       tmp->a_nvals = ch_malloc( (i + 1) * sizeof(struct berval) );
+                       for ( i = 0; !BER_BVISNULL( &a->a_nvals[i] ); i++ ) {
                                ber_dupbv( &tmp->a_nvals[i], &a->a_nvals[i] );
-                               if( tmp->a_nvals[i].bv_val == NULL ) break;
+                               if ( BER_BVISNULL( &tmp->a_nvals[i] ) ) break;
+                               /* FIXME: error? */
                        }
                        tmp->a_nvals[i].bv_val = NULL;
 
@@ -106,7 +112,8 @@ Attribute *attr_dup( Attribute *a )
        return tmp;
 }
 
-Attribute *attrs_dup( Attribute *a )
+Attribute *
+attrs_dup( Attribute *a )
 {
        Attribute *tmp, **next;
 
@@ -165,8 +172,14 @@ attr_merge(
 
        rc = value_add( &(*a)->a_vals, vals );
 
-       if( !rc && nvals ) rc = value_add( &(*a)->a_nvals, nvals );
-       else (*a)->a_nvals = (*a)->a_vals;
+       if ( rc == LDAP_SUCCESS ) {
+               if ( nvals ) {
+                       rc = value_add( &(*a)->a_nvals, nvals );
+                       /* FIXME: what if rc != LDAP_SUCCESS ? */
+               } else {
+                       (*a)->a_nvals = (*a)->a_vals;
+               }
+       }
 
        return rc;
 }
@@ -186,10 +199,10 @@ attr_merge_normalize(
        {
                int     i;
                
-               for ( i = 0; vals[i].bv_val; i++ );
+               for ( i = 0; !BER_BVISNULL( &vals[i] ); i++ );
 
                nvals = sl_calloc( sizeof(struct berval), i + 1, memctx );
-               for ( i = 0; vals[i].bv_val; i++ ) {
+               for ( i = 0; !BER_BVISNULL( &vals[i] ); i++ ) {
                        rc = (*desc->ad_type->sat_equality->smr_normalize)(
                                        SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
                                        desc->ad_type->sat_syntax,
@@ -197,7 +210,7 @@ attr_merge_normalize(
                                        &vals[i], &nvals[i], memctx );
 
                        if ( rc != LDAP_SUCCESS ) {
-                               nvals[i+1].bv_val = NULL;
+                               BER_BVZERO( &nvals[i + 1] );
                                goto error_return;
                        }
                }
@@ -240,8 +253,14 @@ attr_merge_one(
 
        rc = value_add_one( &(*a)->a_vals, val );
 
-       if( !rc && nval ) rc = value_add_one( &(*a)->a_nvals, nval );
-       else (*a)->a_nvals = (*a)->a_vals;
+       if ( rc == LDAP_SUCCESS ) {
+               if ( nval ) {
+                       rc = value_add_one( &(*a)->a_nvals, nval );
+                       /* FIXME: what if rc != LDAP_SUCCESS ? */
+               } else {
+                       (*a)->a_nvals = (*a)->a_vals;
+               }
+       }
        return rc;
 }
 
@@ -253,7 +272,7 @@ attr_merge_normalize_one(
        void            *memctx )
 {
        struct berval   nval;
-       struct berval   *nvalp;
+       struct berval   *nvalp = NULL;
        int             rc;
 
        if ( desc->ad_type->sat_equality &&
@@ -269,8 +288,6 @@ attr_merge_normalize_one(
                        return rc;
                }
                nvalp = &nval;
-       } else {
-               nvalp = NULL;
        }
 
        rc = attr_merge_one( e, desc, val, nvalp );

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 72340523eee60eb94160b210e55ebc05fbb218da..dd605b4ea4edbaad65cdfa8b4dec30660e3a3821 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -65,27 +65,20 @@ schema_info( Entry **entry, const char **text )
        ber_dupbv( &e->e_nname, &global_schemandn );
        e->e_private = NULL;
 
-       vals[0].bv_val = "subentry";
-       vals[0].bv_len = sizeof("subentry")-1;
-       if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) )
-       {
+       BER_BVSTR( &vals[0], "subentry" );
+       if( attr_merge_one( e, ad_structuralObjectClass, vals, NULL ) ) {
                /* Out of memory, do something about it */
                entry_free( e );
                *text = "out of memory";
                return LDAP_OTHER;
        }
 
-       vals[0].bv_val = "top";
-       vals[0].bv_len = sizeof("top")-1;
-       vals[1].bv_val = "subentry";
-       vals[1].bv_len = sizeof("subentry")-1;
-       vals[2].bv_val = "subschema";
-       vals[2].bv_len = sizeof("subschema")-1;
-       vals[3].bv_val = "extensibleObject";
-       vals[3].bv_len = sizeof("extensibleObject")-1;
-       vals[4].bv_val = NULL;
-       if( attr_merge( e, ad_objectClass, vals, vals ) )
-       {
+       BER_BVSTR( &vals[0], "top" );
+       BER_BVSTR( &vals[1], "subentry" );
+       BER_BVSTR( &vals[2], "subschema" );
+       BER_BVSTR( &vals[3], "extensibleObject" );
+       BER_BVZERO( &vals[4] );
+       if ( attr_merge( e, ad_objectClass, vals, NULL ) ) {
                /* Out of memory, do something about it */
                entry_free( e );
                *text = "out of memory";
@@ -121,8 +114,7 @@ schema_info( Entry **entry, const char **text )
                nvals[0].bv_len = global_schemandn.bv_len -
                        (nvals[0].bv_val - global_schemandn.bv_val);
 
-               if( attr_merge_one( e, desc, vals, nvals ) )
-               {
+               if ( attr_merge_one( e, desc, vals, nvals ) ) {
                        /* Out of memory, do something about it */
                        entry_free( e );
                        *text = "out of memory";
@@ -162,15 +154,13 @@ schema_info( Entry **entry, const char **text )
                vals[0].bv_val = timebuf;
                vals[0].bv_len = strlen( timebuf );
 
-               if( attr_merge_one( e, ad_createTimestamp, vals, vals ) )
-               {
+               if( attr_merge_one( e, ad_createTimestamp, vals, NULL ) ) {
                        /* Out of memory, do something about it */
                        entry_free( e );
                        *text = "out of memory";
                        return LDAP_OTHER;
                }
-               if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) )
-               {
+               if( attr_merge_one( e, ad_modifyTimestamp, vals, NULL ) ) {
                        /* Out of memory, do something about it */
                        entry_free( e );
                        *text = "out of memory";