integer indexing must be unsigned

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 495d03af74a4aadd75a1ae3a94aa4537453d3e1a..7118837bf3d43066dcb5d440a5b65590e9045785 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -67,6 +67,9 @@ slapadd( int argc, char **argv )
        int rc = EXIT_SUCCESS;
        int manage = 0; 
 
+       /* default "000" */
+       csnsid = 0;
+
        slap_tool_init( progname, SLAPADD, argc, argv );
 
        memset( &opbuf, 0, sizeof(opbuf) );
@@ -96,6 +99,11 @@ slapadd( int argc, char **argv )
        lmax = 0;
        nextline = 0;
 
+       /* enforce schema checking unless not disabled */
+       if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
+               SLAP_DBFLAGS(be) &= ~(SLAP_DBFLAG_NO_SCHEMA_CHECK);
+       }
+
        if( !dryrun && be->be_entry_open( be, 1 ) != 0 ) {
                fprintf( stderr, "%s: could not open database.\n",
                        progname );
@@ -215,7 +223,7 @@ slapadd( int argc, char **argv )
                        nvals[1].bv_len = 0;
                        nvals[1].bv_val = NULL;
 
-                       csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), 0, 0 );
+                       csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), csnsid, 0 );
                        csn.bv_val = csnbuf;
 
                        timestamp.bv_val = timebuf;
@@ -345,10 +353,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;
 
@@ -376,7 +387,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 );
@@ -385,29 +398,36 @@ 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 );
                        }