userPassword/authPassword can be safely subtyped (though I wouldn't

recommend it).

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 6ef84a90e9a655557e4689fc44c1dc70b33749d8..84c3daf257a6bb4c3d2a29d3b4611909cc9b3b00 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -526,7 +526,7 @@ static struct slap_schema_ad_map {
                        "DESC 'RFC2256/2307: password of user' "
                        "EQUALITY octetStringMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{128} )",
-               NULL, SLAP_AT_FINAL, NULL, NULL, NULL,
+               NULL, 0, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_userPassword) },
 
 #ifdef SLAPD_AUTHPASSWD
@@ -535,7 +535,7 @@ static struct slap_schema_ad_map {
                        "DESC 'RFC3112: authentication password attribute' "
                        "EQUALITY 1.3.6.1.4.1.4203.1.2.2 "
                        "SYNTAX 1.3.6.1.4.1.4203.1.1.2 )",
-               NULL, SLAP_AT_FINAL,
+               NULL, 0,
                NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_authPassword) },
        { "supportedAuthPasswordSchemes", "( 1.3.6.1.4.1.4203.1.3.3 "
@@ -549,7 +549,7 @@ static struct slap_schema_ad_map {
 #endif
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        { "krbName", NULL,
-               NULL, SLAP_AT_FINAL, NULL, NULL, NULL,
+               NULL, 0, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif