From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 13 May 2005 17:35:36 +0000 (+0000)
Subject: finish global_schemacheck removal
X-Git-Tag: OPENLDAP_AC_BP~642
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=002f7ca0628d70aea4d503a739271cc67a0934ef;p=openldap

finish global_schemacheck removal
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index c6588f9699..356ba2f465 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -147,7 +147,6 @@ enum {
 	CFG_DIT,
 	CFG_ATTR,
 	CFG_ATOPT,
-	CFG_CHECK,
 	CFG_REPLOG,
 	CFG_ROOTDSE,
 	CFG_LOGFILE,
@@ -455,9 +454,6 @@ static ConfigTable config_back_cf_table[] = {
 			"SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
 	{ "saslRegexp",	NULL, 3, 3, 0, ARG_MAGIC|CFG_AZREGEXP,
 		&config_generic, NULL, NULL, NULL },
-	{ "schemacheck", "on|off", 2, 2, 0, ARG_ON_OFF|ARG_MAGIC|CFG_CHECK,
-		&config_generic, "( OLcfgGlAt:57 NAME 'olcSchemaCheck' "
-			"SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
 	{ "schemadn", "dn", 2, 2, 0, ARG_MAY_DB|ARG_DN|ARG_MAGIC,
 		&config_schema_dn, "( OLcfgGlAt:58 NAME 'olcSchemaDN' "
 			"SYNTAX OMsDN SINGLE-VALUE )", NULL, NULL },
@@ -604,7 +600,7 @@ static ConfigOCs cf_ocs[] = {
 		 "olcReplogFile $ olcRequires $ olcRestrict $ olcReverseLookup $ "
 		 "olcRootDSE $ olcRootPW $ "
 		 "olcSaslHost $ olcSaslRealm $ olcSaslSecProps $ "
-		 "olcSchemaCheck $ olcSecurity $ olcSizeLimit $ "
+		 "olcSecurity $ olcSizeLimit $ "
 		 "olcSockbufMaxIncoming $ olcSockbufMaxIncomingAuth $ olcSrvtab $ "
 		 "olcThreads $ olcTimeLimit $ olcTLSCACertificateFile $ "
 		 "olcTLSCACertificatePath $ olcTLSCertificateFile $ "
@@ -765,9 +761,6 @@ config_generic(ConfigArgs *c) {
 			}
 			break;
 			
-		case CFG_CHECK:
-			c->value_int = global_schemacheck;
-			break;
 		case CFG_ACL: {
 			AccessControl *a;
 			char *src, *dst, ibuf[11];
@@ -885,7 +878,6 @@ config_generic(ConfigArgs *c) {
 		case CFG_RO:
 		case CFG_AZPOLICY:
 		case CFG_DEPTH:
-		case CFG_CHECK:
 		case CFG_LASTMOD:
 		case CFG_SASLSECP:
 		case CFG_SSTR_IF_MAX:
@@ -1088,15 +1080,6 @@ config_generic(ConfigArgs *c) {
 					return(1);
 			break;
 
-		case CFG_CHECK:
-#if 0
-			global_schemacheck = c->value_int;
-			if(!global_schemacheck) Debug(LDAP_DEBUG_ANY, "%s: "
-				"schema checking disabled! your mileage may vary!\n",
-				c->log, 0, 0);
-#endif
-			break;
-
 		case CFG_ACL:
 			parse_acl(c->be, c->fname, c->lineno, c->argc, c->argv, c->valx);
 			break;
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 2b63204f90..1250297aa3 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1495,9 +1495,6 @@ LDAP_SLAPD_V (const char) 	Versionstr[];
 
 LDAP_SLAPD_V (int)		global_gentlehup;
 LDAP_SLAPD_V (int)		global_idletimeout;
-
-#define global_schemacheck	(1)
-
 LDAP_SLAPD_V (char *)	global_host;
 LDAP_SLAPD_V (char *)	global_realm;
 LDAP_SLAPD_V (char **)	default_passwd_hash;