Add search no-op support.

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

diff --git a/servers/slapd/tools/slapcommon.c b/servers/slapd/tools/slapcommon.c
index 98c436f5ddeb08e3b2309da8260f6033701f50ca..bcea08993ff788d556dfc9a97ebbd94afb4f20d9 100644 (file)
--- a/servers/slapd/tools/slapcommon.c
+++ b/servers/slapd/tools/slapcommon.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* slapcommon.c - common routine for the slap tools */
@@ -25,6 +25,7 @@ int           truncatemode = 0;
 int            verbose         = 0;
 int            continuemode = 0;
 int            nosubordinates = 0;
+int            dryrun = 0;
 
 char   *ldiffile       = NULL;
 FILE   *ldiffp         = NULL;
@@ -97,7 +98,7 @@ slap_tool_init(
 
        switch( tool ) {
        case SLAPADD:
-               options = "b:cd:f:l:n:tv";
+               options = "b:cd:f:l:n:tuv";
                break;
 
        case SLAPINDEX:
@@ -148,6 +149,10 @@ slap_tool_init(
                        mode |= SLAP_TRUNCATE_MODE;
                        break;
 
+               case 'u':       /* dry run */
+                       dryrun++;
+                       break;
+
                case 'v':       /* turn on verbose */
                        verbose++;
                        break;
@@ -183,7 +188,7 @@ slap_tool_init(
                exit( EXIT_FAILURE );
        }
 
-       rc = schema_init();
+       rc = slap_schema_init();
 
        if (rc != 0 ) {
                fprintf( stderr, "%s: slap_schema_init failed!\n", progname );
@@ -204,7 +209,7 @@ slap_tool_init(
                exit( EXIT_FAILURE );
        }
 
-       rc = schema_prep();
+       rc = slap_schema_check();
 
        if (rc != 0 ) {
                fprintf( stderr, "%s: slap_schema_prep failed!\n", progname );
@@ -217,7 +222,7 @@ slap_tool_init(
                rc = dnNormalize( NULL, &base, &nbase );
                if( rc != LDAP_SUCCESS ) {
                        fprintf( stderr, "%s: slap_init invalid suffix (\"%s\")\n",
-                               progname, base );
+                               progname, base.bv_val );
                        exit( EXIT_FAILURE );
                }
 
@@ -232,7 +237,7 @@ slap_tool_init(
                /* If the named base is a glue master, operate on the
                 * entire context
                 */
-               if (be->be_glueflags & SLAP_GLUE_INSTANCE)
+               if (be->be_flags & SLAP_BFLAG_GLUE_INSTANCE)
                        nosubordinates = 1;
 
        } else if ( dbnum == -1 ) {
@@ -240,7 +245,7 @@ slap_tool_init(
                /* If just doing the first by default and it is a
                 * glue subordinate, find the master.
                 */
-               while (be->be_glueflags & SLAP_GLUE_SUBORDINATE) {
+               while (be->be_flags & SLAP_BFLAG_GLUE_SUBORDINATE) {
                        nosubordinates = 1;
                        be++;
                }