Multi-threaded slapindex

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index fec476894d3d82e4c489f940de4a7dc3b629d17b..2b4cd4f934745f5feb53de286f2b13a45d333aec 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -44,32 +44,41 @@ static char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 int
 slapadd( int argc, char **argv )
 {
-       char            *buf = NULL;
-       int         lineno;
-       int         lmax;
-       int                     rc = EXIT_SUCCESS;
-
+       char *buf = NULL;
        const char *text;
        char textbuf[SLAP_TEXT_BUFLEN] = { '\0' };
        size_t textlen = sizeof textbuf;
        const char *progname = "slapadd";
-       int manage = 0; 
 
        struct berval csn;
        struct berval maxcsn;
-       int match;
+       struct berval bvtext;
        Attribute *attr;
        Entry *ctxcsn_e;
        ID      ctxcsn_id, id;
+       OperationBuffer opbuf;
+       Operation *op;
+
+       int match;
        int ret;
-       struct berval bvtext;
-       int i, checkvals;
-       struct berval mc;
+       int checkvals;
+       int lineno;
+       int lmax;
+       int rc = EXIT_SUCCESS;
+       int manage = 0; 
+
        slap_tool_init( progname, SLAPADD, argc, argv );
 
+       memset( &opbuf, 0, sizeof(opbuf) );
+       op = (Operation *) &opbuf;
+
        if( !be->be_entry_open ||
                !be->be_entry_close ||
-               !be->be_entry_put )
+               !be->be_entry_put ||
+               (update_ctxcsn &&
+                (!be->be_dn2id_get ||
+                 !be->be_id2entry_get ||
+                 !be->be_entry_modify)) )
        {
                fprintf( stderr, "%s: database doesn't support necessary operations.\n",
                        progname );
@@ -182,7 +191,9 @@ slapadd( int argc, char **argv )
                        }
 
                        /* check schema */
-                       rc = entry_schema_check( be, e, NULL, manage,
+                       op->o_bd = be;
+
+                       rc = entry_schema_check( op, e, NULL, manage,
                                &text, textbuf, textlen );
 
                        if( rc != LDAP_SUCCESS ) {
@@ -302,19 +313,15 @@ slapadd( int argc, char **argv )
                                if( continuemode ) continue;
                                break;
                        }
-               }
-
-               if ( verbose ) {
-                       if ( dryrun ) {
-                               fprintf( stderr, "added: \"%s\"\n",
-                                       e->e_dn );
-                       } else {
+                       if ( verbose )
                                fprintf( stderr, "added: \"%s\" (%08lx)\n",
                                        e->e_dn, (long) id );
-                       }
+               } else {
+                       if ( verbose )
+                               fprintf( stderr, "added: \"%s\"\n",
+                                       e->e_dn );
                }
 
-done:;
                entry_free( e );
        }