Remove -s (noschemacheck in favor of using global_schemacheck)

diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8
index 47c237878419d97e21738f3d727e2fe9d4725335..f27be9935d2035edfe6e10f6f30664abe5eb84ff 100644 (file)
--- a/doc/man/man8/slapadd.8
+++ b/doc/man/man8/slapadd.8
@@ -8,7 +8,6 @@ slapadd \- Add entries to a SLAPD database
 .B SBINDIR/slapadd
 .B [\-v]
 .B [\-c]
-.B [\-s]
 .B [\-d level]
 .B [\-b suffix]
 .B [\-n dbnum]
@@ -38,9 +37,6 @@ enable verbose mode.
 .B \-c
 enable continue (ignore errors) mode.
 .TP
-.B \-s
-disable schema and other checks.
-.TP
 .BI \-d " level"
 enable debugging messages as defined by the specified
 .IR level .

diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index 8bd6b0de523f7ad851f0f235e1457cb51b315cb7..57623649042ae41dc9dac117d7d3c780af13b678 100644 (file)
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -88,7 +88,7 @@ main( int argc, char **argv )
                        break;
                }
 
-               if( !noschemacheck ) {
+               if( global_schemacheck ) {
                        /* check schema */
                        const char *text;
                        if ( entry_schema_check( e, NULL, &text ) != LDAP_SUCCESS ) {

diff --git a/servers/slapd/tools/slapcommon.c b/servers/slapd/tools/slapcommon.c
index 954635a801d62f93b522fae194cd46f82dbe0686..67793bb3685fe41d0b7ff829ae41f8548d80ac59 100644 (file)
--- a/servers/slapd/tools/slapcommon.c
+++ b/servers/slapd/tools/slapcommon.c
@@ -23,7 +23,6 @@ char  *progname       = NULL;
 char   *conffile       = SLAPD_DEFAULT_CONFIGFILE;
 int            truncatemode = 0;
 int            verbose         = 0;
-int            noschemacheck = 0;
 int            continuemode = 0;
 
 char   *ldiffile       = NULL;
@@ -42,11 +41,11 @@ usage( int tool )
        char *options = NULL;
        fprintf( stderr,
                "usage: %s [-v] [-c] [-d debuglevel] [-f configfile]\n"
-                        "\t[-n databasenumber | -b suffix]", progname );
+                       "\t[-n databasenumber | -b suffix]", progname );
 
        switch( tool ) {
        case SLAPADD:
-               options = "\t[-s] [-l ldiffile]\n";
+               options = "\t[-l ldiffile]\n";
                break;
 
        case SLAPCAT:
@@ -97,7 +96,7 @@ slap_tool_init(
 
        switch( tool ) {
        case SLAPADD:
-               options = "b:cd:f:l:n:stv";
+               options = "b:cd:f:l:n:tv";
                break;
 
        case SLAPINDEX:
@@ -142,10 +141,6 @@ slap_tool_init(
                        dbnum = atoi( optarg ) - 1;
                        break;
 
-               case 's':       /* disable schema checking */
-                       noschemacheck++;
-                       break;
-
                case 't':       /* turn on truncate */
                        truncatemode++;
                        mode |= SLAP_TRUNCATE_MODE;

diff --git a/servers/slapd/tools/slapcommon.h b/servers/slapd/tools/slapcommon.h
index dd0f1b1f55ab90eb8dd4b04f238a5d021bf8bfab..ca8dcf52077c95564a9dec29de4b2f65ab4cfd16 100644 (file)
--- a/servers/slapd/tools/slapcommon.h
+++ b/servers/slapd/tools/slapcommon.h
@@ -24,7 +24,6 @@ extern        char    *conffile;
 extern Backend *be;
 extern int             appendmode;
 extern int             verbose;
-extern int             noschemacheck;
 extern int             continuemode;
 
 extern char    *ldiffile;