From ccaf69a7bccba0524498306b1295c2d5a07da69e Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 22 Feb 2008 14:17:43 +0000 Subject: [PATCH] Tweak order of operational attrs --- servers/slapd/slapadd.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c index 34058917fb..9369d7c690 100644 --- a/servers/slapd/slapadd.c +++ b/servers/slapd/slapadd.c @@ -255,6 +255,20 @@ slapadd( int argc, char **argv ) 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 ) == NULL ) { @@ -263,13 +277,6 @@ slapadd( int argc, char **argv ) 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 ) == NULL ) { @@ -277,13 +284,6 @@ slapadd( int argc, char **argv ) 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 ) { int rc_sid;