Minor cleanup

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 9d67b0f74b35bf7ddcd21f2a823f1854e5098d16..2c1717b6c102f00cdd193601c3796269f3981f94 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -722,7 +722,7 @@ attributetype ( 2.5.18.6 NAME 'subtreeSpecification'
 
 objectclass ( 2.5.20.0 NAME 'subentry'
        SUP top STRUCTURAL
-       MUST ( cn $ subtreeSpecification ) )   
+       MUST ( cn $ subtreeSpecification ) )
 
 
 #
@@ -771,28 +771,6 @@ attributetype ( 1.3.6.1.4.1.4203.1.3.5
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
        USAGE dSAOperation )
 
-#
-# RFC 3112 (authPassword)
-#
-attributetype ( 1.3.6.1.4.1.4203.1.3.4
-       NAME 'authPassword'
-       DESC 'RFC3112: authentication password attribute'
-       SYNTAX 1.3.6.1.4.1.4203.666.2.2
-       USAGE dSAOperation )
-
-attributetype ( 1.3.6.1.4.1.4203.1.3.3
-       NAME 'supportedAuthPasswordSchemes'
-       DESC 'RFC3112: supported authPassword schemes'
-       EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32}
-       NO-USER-MODIFICATION USAGE dSAOperation )
-
-objectclass ( 1.3.6.1.4.1.4203.1.4.7
-       NAME 'authPasswordObject'
-       DESC 'RFC3112: authPassword mixin class'
-       MAY authPassword
-       AUXILIARY )
-
 #
 # LDUP/LCUP attributes
 #  Experimental!

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 09ac283bc426e92e8c75391b3e1f804114fd0955..470fbfc5130c72bb6f9e09fcf64830aa69075011 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -407,7 +407,8 @@ typedef struct slap_matching_rule {
 #define smr_extensions         smr_mrule.mr_extensions
 } MatchingRule;
 
-struct slap_attr_desc;
+struct slap_entry;
+struct slap_attr;
 
 typedef int (AttributeTypeSchemaCheckFN)(
        struct slap_entry *e,
@@ -451,6 +452,8 @@ typedef struct slap_attribute_type {
 #define is_at_obsolete(at)             ((at)->sat_obsolete)
 #define is_at_no_user_mod(at)  ((at)->sat_no_user_mod)
 
+struct slap_object_class;
+
 typedef int (ObjectClassSchemaCheckFN)(
        struct slap_entry *e,
        struct slap_object_class *oc,