fix typo

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 5f8d6be3644671f4ab2a53a43c2fcf5b89a9a42d..468dcea6716c6f1d14b8660bc6c4e2cbebc88abf 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * Portions Copyright 1998-2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -203,6 +203,7 @@ slapadd( int argc, char **argv )
                                        if( continuemode ) continue;
                                        break;
                                }
+                               textbuf[ 0 ] = '\0';
                        }
                }
 
@@ -255,33 +256,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 ) {
@@ -353,10 +354,13 @@ slapadd( int argc, char **argv )
                        ctxcsn_e = be->be_entry_get( be, ctxcsn_id );
                        if ( ctxcsn_e != NULL ) {
                                Entry *e = entry_dup( ctxcsn_e );
+                               int change;
                                attr = attr_find( e->e_attrs, slap_schema.si_ad_contextCSN );
                                if ( attr ) {
                                        int             i;
 
+                                       change = 0;
+
                                        for ( i = 0; !BER_BVISNULL( &attr->a_nvals[ i ] ); i++ ) {
                                                int rc_sid;
 
@@ -384,7 +388,9 @@ slapadd( int argc, char **argv )
                                                                &maxcsn[ sid ], &attr->a_nvals[i], &text );
                                                }
 
-                                               if ( match < 0 ) {
+                                               if ( match > 0 ) {
+                                                       change = 1;
+                                               } else {
                                                        AC_MEMCPY( maxcsn[ sid ].bv_val,
                                                                attr->a_nvals[ i ].bv_val,
                                                                attr->a_nvals[ i ].bv_len );
@@ -393,30 +399,37 @@ slapadd( int argc, char **argv )
                                                }
                                        }
 
-                                       if ( attr->a_nvals != attr->a_nvals ) {
-                                               ber_bvarray_free( attr->a_nvals );
+                                       if ( change ) {
+                                               if ( attr->a_nvals != attr->a_vals ) {
+                                                       ber_bvarray_free( attr->a_nvals );
+                                               }
+                                               attr->a_nvals = NULL;
+                                               ber_bvarray_free( attr->a_vals );
+                                               attr->a_vals = NULL;
+                                               attr->a_numvals = 0;
                                        }
-                                       attr->a_nvals = NULL;
-                                       ber_bvarray_free( attr->a_vals );
-                                       attr->a_vals = NULL;
+                               } else {
+                                       change = 1;
                                }
 
-                               for ( sid = 0; sid <= SLAP_SYNC_SID_MAX; sid++ ) {
-                                       if ( maxcsn[ sid ].bv_len ) {
-                                               attr_merge_one( e, slap_schema.si_ad_contextCSN,
-                                                       &maxcsn[ sid], NULL );
+                               if ( change ) {
+                                       for ( sid = 0; sid <= SLAP_SYNC_SID_MAX; sid++ ) {
+                                               if ( maxcsn[ sid ].bv_len ) {
+                                                       attr_merge_one( e, slap_schema.si_ad_contextCSN,
+                                                               &maxcsn[ sid], NULL );
+                                               }
+                                       }
+
+                                       ctxcsn_id = be->be_entry_modify( be, e, &bvtext );
+                                       if( ctxcsn_id == NOID ) {
+                                               fprintf( stderr, "%s: could not modify ctxcsn\n",
+                                                       progname);
+                                               rc = EXIT_FAILURE;
+                                       } else if ( verbose ) {
+                                               fprintf( stderr, "modified: \"%s\" (%08lx)\n",
+                                                       e->e_dn, (long) ctxcsn_id );
                                        }
                                }
-                       
-                               ctxcsn_id = be->be_entry_modify( be, e, &bvtext );
-                               if( ctxcsn_id == NOID ) {
-                                       fprintf( stderr, "%s: could not modify ctxcsn\n",
-                                               progname);
-                                       rc = EXIT_FAILURE;
-                               } else if ( verbose ) {
-                                       fprintf( stderr, "modified: \"%s\" (%08lx)\n",
-                                               e->e_dn, (long) ctxcsn_id );
-                               }
                                entry_free( e );
                        }
                }