From 7f604a69c50674f752a2f7bafc5fb5d42258dcb5 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 14 Apr 2008 20:28:35 +0000 Subject: [PATCH] Tweak order of operational attrs --- servers/slapd/slapadd.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 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,33 +255,33 @@ 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_modifiersName ) + if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp ) == NULL ) { - vals[0] = name; - nvals[0] = nname; - attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals ); + vals[0] = timestamp; + attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL ); } - if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp ) + if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN ) == NULL ) { - vals[0] = timestamp; - attr_merge( e, slap_schema.si_ad_createTimestamp, vals, NULL ); + vals[0] = csn; + attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL ); } - if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp ) + if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName ) == NULL ) { - vals[0] = timestamp; - attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL ); + vals[0] = name; + nvals[0] = nname; + attr_merge( e, slap_schema.si_ad_modifiersName, vals, nvals ); } - if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN ) + if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp ) == NULL ) { - vals[0] = csn; - attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL ); + vals[0] = timestamp; + attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL ); } if ( update_ctxcsn ) { -- 2.39.5