Add Backend to system schema check routines

diff --git a/servers/slapd/back-monitor/backmon.dsp b/servers/slapd/back-monitor/backmon.dsp
index 0c4b76e2b132a26c68b48e7cba48380a4b832a35..ffce395cb66e66dab7f573a8c344d63c23c5e561 100644 (file)
--- a/servers/slapd/back-monitor/backmon.dsp
+++ b/servers/slapd/back-monitor/backmon.dsp
@@ -167,6 +167,10 @@ SOURCE=.\init.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\listener.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\log.c
 # End Source File
 # Begin Source File

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index 4e44ffaafec831e872d9aaa1f43f8124efb4aff5..dc5842c187d05908bc58a6207effa31193479746 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -56,7 +56,7 @@ entry_schema_check(
 
                if( a->a_desc->ad_type->sat_check ) {
                        int rc = (a->a_desc->ad_type->sat_check)(
-                               e, a, text, textbuf, textlen );
+                               be, e, a, text, textbuf, textlen );
                        if( rc != LDAP_SUCCESS ) {
                                return rc;
                        }
@@ -209,7 +209,7 @@ entry_schema_check(
                }
 
                if ( oc->sco_check ) {
-                       int rc = (oc->sco_check)( e, oc,
+                       int rc = (oc->sco_check)( be, e, oc,
                                text, textbuf, textlen );
                        if( rc != LDAP_SUCCESS ) {
                                return rc;

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index e6572be51039883ff61483c2c15c9c4307ad6a08..079026f7ad2a9e2249cbce17bd90339ca5eb252b 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -713,6 +713,7 @@ slap_schema_check( void )
 }
 
 static int rootDseObjectClass (
+       Backend *be,
        Entry *e,
        ObjectClass *oc,
        const char** text,
@@ -732,6 +733,7 @@ static int rootDseObjectClass (
 }
 
 static int subentryObjectClass (
+       Backend *be,
        Entry *e,
        ObjectClass *oc,
        const char** text,
@@ -747,6 +749,7 @@ static int subentryObjectClass (
 }
 
 static int rootDseAttribute (
+       Backend *be,
        Entry *e,
        Attribute *attr,
        const char** text,
@@ -766,6 +769,7 @@ static int rootDseAttribute (
 }
 
 static int subentryAttribute (
+       Backend *be,
        Entry *e,
        Attribute *attr,
        const char** text,
@@ -783,6 +787,7 @@ static int subentryAttribute (
 }
 
 static int referralAttribute (
+       Backend *be,
        Entry *e,
        Attribute *attr,
        const char** text,

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 6f42c54e249ef604831f96370261d27330a30e0c..20c37414a31f33d14bb7417d8dd4ebeaab411993 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -413,6 +413,7 @@ struct slap_entry;
 struct slap_attr;
 
 typedef int (AttributeTypeSchemaCheckFN)(
+       struct slap_backend_db *be,
        struct slap_entry *e,
        struct slap_attr *attr,
        const char** text,
@@ -457,6 +458,7 @@ typedef struct slap_attribute_type {
 struct slap_object_class;
 
 typedef int (ObjectClassSchemaCheckFN)(
+       struct slap_backend_db *be,
        struct slap_entry *e,
        struct slap_object_class *oc,
        const char** text,