Tweak order of operational attrs

This commit is contained in:
Howard Chu 2008-02-22 14:17:43 +00:00
parent a9291b9c02
commit ccaf69a7bc

View File

@ -255,6 +255,20 @@ slapadd( int argc, char **argv )
attr_merge( e, slap_schema.si_ad_creatorsName, vals, nvals ); attr_merge( e, slap_schema.si_ad_creatorsName, vals, nvals );
} }
if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp )
== NULL )
{
vals[0] = timestamp;
attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL );
}
if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN )
== NULL )
{
vals[0] = csn;
attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL );
}
if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName ) if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName )
== NULL ) == NULL )
{ {
@ -263,13 +277,6 @@ slapadd( int argc, char **argv )
attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals ); attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals );
} }
if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp )
== NULL )
{
vals[0] = timestamp;
attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL );
}
if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp ) if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp )
== NULL ) == NULL )
{ {
@ -277,13 +284,6 @@ slapadd( int argc, char **argv )
attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL ); attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL );
} }
if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN )
== NULL )
{
vals[0] = csn;
attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL );
}
if ( update_ctxcsn ) { if ( update_ctxcsn ) {
int rc_sid; int rc_sid;