Commit c83f7539 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Mostly remove global_schemacheck. More cleanup needed in

bconfig.c and back-sql.
parent cd49888b
......@@ -1089,10 +1089,12 @@ config_generic(ConfigArgs *c) {
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:
......
......@@ -842,7 +842,7 @@ int slap_mods_opattrs(
if( op->o_tag == LDAP_REQ_ADD ) {
struct berval tmpval;
if( global_schemacheck ) {
{
int rc = mods_structural_class( mods, &tmpval,
text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) return rc;
......
......@@ -1495,7 +1495,9 @@ LDAP_SLAPD_V (const char) Versionstr[];
LDAP_SLAPD_V (int) global_gentlehup;
LDAP_SLAPD_V (int) global_idletimeout;
LDAP_SLAPD_V (int) global_schemacheck;
#define global_schemacheck (1)
LDAP_SLAPD_V (char *) global_host;
LDAP_SLAPD_V (char *) global_realm;
LDAP_SLAPD_V (char **) default_passwd_hash;
......
......@@ -111,9 +111,6 @@ entry_schema_check(
}
}
/* it's a REALLY bad idea to disable schema checks */
if( !global_schemacheck ) return LDAP_SUCCESS;
/* find the structural object class attribute */
asc = attr_find( e->e_attrs, ad_structuralObjectClass );
if ( asc == NULL ) {
......
......@@ -25,8 +25,6 @@
#include "slap.h"
#include "ldap_schema.h"
int global_schemacheck = 1; /* schemacheck ON is default */
static void oc_usage(void);
static void at_usage(void);
......
......@@ -145,7 +145,7 @@ slapadd( int argc, char **argv )
break;
}
if( global_schemacheck ) {
{
Attribute *sc = attr_find( e->e_attrs,
slap_schema.si_ad_structuralObjectClass );
Attribute *oc = attr_find( e->e_attrs,
......@@ -176,7 +176,8 @@ slapadd( int argc, char **argv )
break;
}
attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, &val, NULL );
attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
&val, NULL );
}
/* check schema */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment