Make 'schemacheck on' the default.

diff --git a/doc/guide/slapdconfig.sdf b/doc/guide/slapdconfig.sdf
index 34e37c20674a406ac67cbf520e0c5b31b615eeb5..f151393e979a627b24fe03b67d010f621d38e5bf 100644 (file)
--- a/doc/guide/slapdconfig.sdf
+++ b/doc/guide/slapdconfig.sdf
@@ -175,14 +175,14 @@ contain a host part and optionally a distinguished name part.
 H4: schemacheck { on | off }
 
 This option turns schema checking on or off. If schema
-checking is on, entries added or modified will be checked to
-ensure they obey the schema rules implied by their object
-class(es) as defined by the corresponding objectclass
+checking is on, entries added or modified through LDAP operations
+will be checked to ensure they obey the schema rules implied
+by their object class(es) as defined by the corresponding objectclass
 option(s). If schema checking is off this check is not done.
 
 \Default:
 
-E: schemacheck off
+E: schemacheck on
 
 H4: sizelimit <integer>
 

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index a3acdefa152ed54d5e6eb84e9e9021b431cc955f..4f7ee624a0f6bacfcd76434d83dcda512f6bf22f 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -195,7 +195,7 @@ Specify the referral to pass back when
 cannot find a local database to handle a request.
 .TP
 .B schemacheck { on | off }
-Turn schema checking on or off. The default is off.
+Turn schema checking on or off. The default is on.
 .TP
 .B sizelimit <integer>
 Specify the maximum number of entries to return from a search operation.

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 153f9d21f464367f01fbc9587f76ed2437a9f779..100400e9f3ae88030a917c35fc85762412fc3c32 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -359,10 +359,10 @@ read_config( char *fname )
                                    fname, lineno, 0 );
                                return( 1 );
                        }
-                       if ( strcasecmp( cargv[1], "on" ) == 0 ) {
-                               global_schemacheck = 1;
-                       } else {
+                       if ( strcasecmp( cargv[1], "off" ) == 0 ) {
                                global_schemacheck = 0;
+                       } else {
+                               global_schemacheck = 1;
                        }
 
                /* specify access control info */

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 900263c84aaa000056f1d0b32fd238a2d4265ab5..23efb7fbaded02331796c6a002a3c6f36d0797d6 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -10,7 +10,7 @@
 #include "slap.h"
 
 struct objclass                *global_oc;
-int                    global_schemacheck;
+int    global_schemacheck = 1; /* schemacheck on is default */
 
 static void            oc_usage(void);