Remove experimental authPassword code

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 76ba4a3e31c9b318199385c618a5a89ecd6208ae..885aff7fe51a91471ef216ef8253d44114878108 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -572,19 +572,6 @@ attributetype ( 1.3.6.1.4.1.250.1.32
 #
 # OpenLDAP specific schema items
 #
-attributetype ( 1.3.6.1.4.1.4203.666.1.1
-       NAME 'authPassword'
-       DESC 'OpenLDAP authentication password attribute'
-       SYNTAX 1.3.6.1.4.1.4203.666.2.2
-       USAGE dSAOperation )
-
-attributetype ( 1.3.6.1.4.1.4203.666.1.2
-       NAME 'supportedAuthPasswordSchemes'
-       DESC 'OpenLDAP supported authPassword schemes'
-       EQUALITY caseIgnoreIA5Match
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32}
-       NO-USER-MODIFICATION USAGE dSAOperation )
-
 attributetype ( 1.3.6.1.4.1.4203.666.1.3
        NAME 'entry'
        DESC 'OpenLDAP ACL entry pseudo attribute'
@@ -603,8 +590,3 @@ attributetype ( 1.3.6.1.4.1.4203.666.1.5
        EQUALITY OpenLDAPaciMatch
        SYNTAX 1.3.6.1.4.1.4203.666.2.1
        USAGE directoryOperation )
-
-objectclass ( 1.3.6.1.4.1.4203.666.3.1 NAME 'authPasswordObject'
-       DESC 'OpenLDAP authPassword mixin class'
-       MAY authPassword
-       AUXILIARY )

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 4e7a570528deb5fbbe2d91d28d8feeae5add196d..62d3548b0e5e26b3ca902deb4810cdf25885a0fa 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -71,7 +71,6 @@
 #define integerFirstComponentMatch             NULL
 
 #define OpenLDAPaciMatch                               NULL
-#define authPasswordMatch                              NULL
 
 /* recycled indexing/filtering routines */
 #define caseIgnoreIndexer                              caseIgnoreIA5Indexer
@@ -2302,15 +2301,10 @@ struct syntax_defs_rec syntax_defs[] = {
 
        /* OpenLDAP Experimental Syntaxes */
        {"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )",
-               0, IA5StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */, NULL, NULL},
-       {"( 1.3.6.1.4.1.4203.666.2.2 DESC 'OpenLDAP authPassword' )",
-               0, NULL, NULL, NULL},
+               0, IA5StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */,
+               NULL, NULL},
        {"( 1.3.6.1.4.1.4203.666.2.3 DESC 'OpenLDAP void' " X_HIDE ")" ,
                SLAP_SYNTAX_HIDE, inValidate, NULL, NULL},
-#if 0 /* not needed */
-       {"( 1.3.6.1.4.1.4203.666.2.4 DESC 'OpenLDAP DN' " X_HIDE ")" ,
-               SLAP_SYNTAX_HIDE, inValidate, NULL, NULL},
-#endif
 
        {NULL, 0, NULL, NULL, NULL}
 };
@@ -2589,13 +2583,6 @@ struct mrule_defs_rec mrule_defs[] = {
                caseExactIA5SubstringsFilter,
                NULL},
 
-       {"( 1.3.6.1.4.1.4203.666.4.1 NAME 'authPasswordMatch' "
-               "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
-               SLAP_MR_EQUALITY,
-               NULL, NULL,
-               authPasswordMatch, NULL, NULL,
-               NULL},
-
        {"( 1.3.6.1.4.1.4203.666.4.2 NAME 'OpenLDAPaciMatch' "
                "SYNTAX 1.3.6.1.4.1.4203.666.2.1 )",
                SLAP_MR_EQUALITY,

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 1bd2f942f4ec156b5f7fddc05899e27e7c58d369..4a6cd313f8d55b35a42d4681592041bb0845fe70 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -189,8 +189,6 @@ struct slap_schema_ad_map {
 
        { "userPassword", NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_userPassword) },
-       { "authPassword", NULL, NULL, NULL,
-               offsetof(struct slap_internal_schema, si_ad_authPassword) },
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        { "krbName", NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_krbName) },

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 9c262ec3cbde552768a5b87d1612578cf85217e5..638884c11d1afeabf799c74c43405492bb11c166 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -435,7 +435,6 @@ struct slap_internal_schema {
 
        /* Other attributes descriptions */
        AttributeDescription *si_ad_userPassword;
-       AttributeDescription *si_ad_authPassword;
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
        AttributeDescription *si_ad_krbName;
 #endif