return structuralObjectClass errors

[openldap] / servers / slapd / operational.c

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index 121d5938ed662764087960ad7dcf7b27c19e9c7a..2d8510614f9c6d2ea07552b23e5e72319bbecd49 100644 (file)
--- a/servers/slapd/operational.c
+++ b/servers/slapd/operational.c
@@ -29,8 +29,7 @@ slap_operational_subschemaSubentry( Backend *be )
        /* The backend wants to take care of it */
        if ( be && !SLAP_FRONTEND(be) && be->be_schemadn.bv_val ) return NULL;
 
-       a = ch_malloc( sizeof( Attribute ) );
-       a->a_desc = slap_schema.si_ad_subschemaSubentry;
+       a = attr_alloc( slap_schema.si_ad_subschemaSubentry );
 
        a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
        ber_dupbv( a->a_vals, &frontendDB->be_schemadn );
@@ -42,9 +41,6 @@ slap_operational_subschemaSubentry( Backend *be )
        a->a_nvals[1].bv_len = 0;
        a->a_nvals[1].bv_val = NULL;
 
-       a->a_next = NULL;
-       a->a_flags = 0;
-
        return a;
 }
 
@@ -57,8 +53,7 @@ slap_operational_entryDN( Entry *e )
        assert( !BER_BVISNULL( &e->e_name ) );
        assert( !BER_BVISNULL( &e->e_nname ) );
 
-       a = ch_malloc( sizeof( Attribute ) );
-       a->a_desc = slap_schema.si_ad_entryDN;
+       a = attr_alloc( slap_schema.si_ad_entryDN );
 
        a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
        ber_dupbv( &a->a_vals[ 0 ], &e->e_name );
@@ -68,9 +63,6 @@ slap_operational_entryDN( Entry *e )
        ber_dupbv( &a->a_nvals[ 0 ], &e->e_nname );
        BER_BVZERO( &a->a_nvals[ 1 ] );
 
-       a->a_next = NULL;
-       a->a_flags = 0;
-
        return a;
 }
 
@@ -82,8 +74,7 @@ slap_operational_hasSubordinate( int hs )
 
        val = hs ? slap_true_bv : slap_false_bv;
 
-       a = ch_malloc( sizeof( Attribute ) );
-       a->a_desc = slap_schema.si_ad_hasSubordinates;
+       a = attr_alloc( slap_schema.si_ad_hasSubordinates );
        a->a_vals = ch_malloc( 2 * sizeof( struct berval ) );
 
        ber_dupbv( &a->a_vals[0], &val );
@@ -91,9 +82,6 @@ slap_operational_hasSubordinate( int hs )
 
        a->a_nvals = a->a_vals;
 
-       a->a_next = NULL;
-       a->a_flags = 0;
-
        return a;
 }