Don't reeval expression

[openldap] / servers / slapd / tools / slapadd.c

diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index aeede043bb373a1c9fc49fb1ae3ca14d8a5247a0..1f31d57735385f4f5b0195d30c424622e6c173b9 100644 (file)
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -59,8 +59,12 @@ main( int argc, char **argv )
                Entry *e = str2entry( buf );
                struct berval bvtext;
 
+               /*
+                * Initialize text buffer
+                */
                bvtext.bv_len = textlen;
                bvtext.bv_val = textbuf;
+               bvtext.bv_val[0] = '\0';
 
                if( e == NULL ) {
                        fprintf( stderr, "%s: could not parse entry (line=%d)\n",
@@ -119,13 +123,12 @@ main( int argc, char **argv )
                        if( sc == NULL ) {
                                struct berval vals[2];
 
-                               /* int ret = */ 
-                               structural_class( oc->a_vals, vals,
+                               rc = structural_class( oc->a_vals, vals,
                                        NULL, &text, textbuf, textlen );
 
-                               if( vals[0].bv_len == 0 ) {
-                                       fprintf( stderr, "%s: dn=\"%s\" (line=%d): %s\n",
-                                               progname, e->e_dn, lineno, text );
+                               if( rc != LDAP_SUCCESS ) {
+                                       fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
+                                               progname, e->e_dn, lineno, rc, text );
                                        rc = EXIT_FAILURE;
                                        entry_free( e );
                                        if( continuemode ) continue;
@@ -141,8 +144,8 @@ main( int argc, char **argv )
                        rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
 
                        if( rc != LDAP_SUCCESS ) {
-                               fprintf( stderr, "%s: dn=\"%s\" (line=%d): %s\n",
-                                       progname, e->e_dn, lineno, text );
+                               fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
+                                       progname, e->e_dn, lineno, rc, text );
                                rc = EXIT_FAILURE;
                                entry_free( e );
                                if( continuemode ) continue;
@@ -153,12 +156,12 @@ main( int argc, char **argv )
                if ( SLAP_LASTMOD(be) ) {
                        struct tm *ltm;
                        time_t now = slap_get_time();
-                       char uuidbuf[40];
-                       struct berval vals[2];
+                       char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
+                       struct berval vals[ 2 ];
 
                        struct berval name, timestamp, csn;
-                       char timebuf[22];
-                       char csnbuf[64];
+                       char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+                       char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 
                        ltm = gmtime(&now);
                        lutil_gentime( timebuf, sizeof(timebuf), ltm );
@@ -189,7 +192,7 @@ main( int argc, char **argv )
                        if( attr_find( e->e_attrs, slap_schema.si_ad_creatorsName )
                                == NULL )
                        {
-                               ber_dupbv( &vals[0], &name );
+                               vals[0] = name;
                                vals[1].bv_len = 0;
                                vals[1].bv_val = NULL;
                                attr_merge( e, slap_schema.si_ad_creatorsName, vals);
@@ -198,7 +201,7 @@ main( int argc, char **argv )
                        if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName )
                                == NULL )
                        {
-                               ber_dupbv( &vals[0], &name );
+                               vals[0] = name;
                                vals[1].bv_len = 0;
                                vals[1].bv_val = NULL;
                                attr_merge( e, slap_schema.si_ad_modifiersName, vals);
@@ -207,7 +210,7 @@ main( int argc, char **argv )
                        if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp )
                                == NULL )
                        {
-                               ber_dupbv( &vals[0], &timestamp );
+                               vals[0] = timestamp;
                                vals[1].bv_len = 0;
                                vals[1].bv_val = NULL;
                                attr_merge( e, slap_schema.si_ad_createTimestamp, vals );
@@ -216,7 +219,7 @@ main( int argc, char **argv )
                        if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp )
                                == NULL )
                        {
-                               ber_dupbv( &vals[0], &timestamp );
+                               vals[0] = timestamp;
                                vals[1].bv_len = 0;
                                vals[1].bv_val = NULL;
                                attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals );
@@ -225,7 +228,7 @@ main( int argc, char **argv )
                        if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN )
                                == NULL )
                        {
-                               ber_dupbv( &vals[0], &csn );
+                               vals[0] = csn;
                                vals[1].bv_len = 0;
                                vals[1].bv_val = NULL;
                                attr_merge( e, slap_schema.si_ad_entryCSN, vals );