initialize AttributeAssertion before using

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 53e9e9625932b08f57e004b4d2aaf18bdb74785e..09734c6a2d22000af907ce35efd47e8008440b3e 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -99,6 +99,7 @@ static void *do_put(void *ptr)
 
        } while (1);
        ldap_pvt_thread_mutex_unlock( &put_mutex1 );
+       return NULL;
 }
 
 int
@@ -120,7 +121,7 @@ slapadd( int argc, char **argv )
        Entry *ctxcsn_e;
        ID      ctxcsn_id, id;
        int ret;
-       int i;
+       int i, checkvals;
        struct berval mc;
        ldap_pvt_thread_t put_tid;
 
@@ -140,6 +141,8 @@ slapadd( int argc, char **argv )
                }
        }
 
+       checkvals = (slapMode & SLAP_TOOL_QUICK) ? 0 : 1;
+
        if ( use_thread ) {
                ldap_pvt_thread_initialize();
                ldap_pvt_thread_cond_init( &put_cond1 );
@@ -170,7 +173,7 @@ slapadd( int argc, char **argv )
        }
 
        while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
-               Entry *e = str2entry( buf );
+               Entry *e = str2entry2( buf, checkvals );
 
                /*
                 * Initialize text buffer