Remove db_supported_realms and db_free_supported_realms from the DAL

table, and remove the corresponding libkdb5 interfaces (which don't
seem to have been in the library export table).

ticket: 6749
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24158 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/kdb.h b/src/include/kdb.h
index 6248725a606281c54fe781d89b94452a73f0473b..dd1e613be6f81b3a87aeacf9671f685dcc97dbff 100644 (file)
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -447,10 +447,6 @@ krb5_error_code krb5_db_iterate ( krb5_context kcontext,
                                   char *match_entry,
                                   int (*func) (krb5_pointer, krb5_db_entry *),
                                   krb5_pointer func_arg );
-krb5_error_code krb5_supported_realms ( krb5_context kcontext,
-                                        char **realms );
-krb5_error_code krb5_free_supported_realms ( krb5_context kcontext,
-                                             char **realms );
 krb5_error_code krb5_db_set_master_key_ext ( krb5_context kcontext,
                                              char *pwd,
                                              krb5_keyblock *key );
@@ -868,7 +864,7 @@ krb5_dbe_free_tl_data(krb5_context, krb5_tl_data *);
  * DAL.  It is passed to init_library to allow KDB modules to detect when
  * they are being loaded by an incompatible version of the KDC.
  */
-#define KRB5_KDB_DAL_VERSION 20100701
+#define KRB5_KDB_DAL_VERSION 20100702
 
 /*
  * A krb5_context can hold one database object.  Modules should use
@@ -1136,17 +1132,6 @@ typedef struct _kdb_vftabl {
     /* Optional: Free a policy entry returned by db_get_policy. */
     void (*db_free_policy)(krb5_context kcontext, osa_policy_ent_t val);
 
-    /*
-     * Optional: Fill in *realms with an array of realm names.  This function
-     * is not used or implemented.
-     */
-    krb5_error_code (*db_supported_realms)(krb5_context kcontext,
-                                           char **realms);
-
-    /* Optional: Free a realm list returned by db_supported_realms. */
-    krb5_error_code (*db_free_supported_realms)(krb5_context kcontext,
-                                                char **realms);
-
     /*
      * Optional: Convert an error code returned by a module function (casted
      * from krb5_error_code to long) into a string.  If this function is

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index c4c7ec6dc118991e792a1929dc89b0155ac0219a..6f721dd6c5a2ae5a10ff48288944c9d49afafb48 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -1119,38 +1119,6 @@ krb5_db_iterate(krb5_context kcontext,
     return status;
 }
 
-krb5_error_code
-krb5_supported_realms(krb5_context kcontext, char **realms)
-{
-    krb5_error_code status = 0;
-    kdb_vftabl *v;
-
-    status = get_vftabl(kcontext, &v);
-    if (status)
-        return status;
-    if (v->db_supported_realms == NULL)
-        return KRB5_KDB_DBTYPE_NOSUP;
-    status = v->db_supported_realms(kcontext, realms);
-    get_errmsg(kcontext, status);
-    return status;
-}
-
-krb5_error_code
-krb5_free_supported_realms(krb5_context kcontext, char **realms)
-{
-    krb5_error_code status = 0;
-    kdb_vftabl *v;
-
-    status = get_vftabl(kcontext, &v);
-    if (status)
-        return status;
-    if (v->db_free_supported_realms == NULL)
-        return KRB5_KDB_DBTYPE_NOSUP;
-    status = v->db_free_supported_realms(kcontext, realms);
-    get_errmsg(kcontext, status);
-    return status;
-}
-
 krb5_error_code
 krb5_db_set_master_key_ext(krb5_context kcontext,
                            char *pwd, krb5_keyblock * key)

diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
index 73aa6394f010a63d729151e97608c16eb0747cfd..b335068e81695ccdcc64056b0918ff6deac0db1f 100644 (file)
--- a/src/plugins/kdb/db2/db2_exp.c
+++ b/src/plugins/kdb/db2/db2_exp.c
@@ -249,8 +249,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_db2, kdb_function_table) = {
     /* db_iter_policy */                         wrap_krb5_db2_iter_policy,
     /* db_delete_policy */                       wrap_krb5_db2_delete_policy,
     /* db_free_policy */                         wrap_krb5_db2_free_policy,
-    /* db_supported_realms */                    NULL,
-    /* db_free_supported_realms */               NULL,
     /* errcode_2_string */                       NULL,
     /* release_errcode_string */                 NULL,
     /* db_alloc */                               krb5_db2_alloc,

diff --git a/src/plugins/kdb/ldap/ldap_exp.c b/src/plugins/kdb/ldap/ldap_exp.c
index 13bbc9351aa778edbae063572d0023215ec32c6c..e13b0d2ebdd995c4a6f0401283131e1a9ed14c69 100644 (file)
--- a/src/plugins/kdb/ldap/ldap_exp.c
+++ b/src/plugins/kdb/ldap/ldap_exp.c
@@ -69,8 +69,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_ldap, kdb_function_table) = {
     /* db_iter_policy */                    krb5_ldap_iterate_password_policy,
     /* db_delete_policy */                  krb5_ldap_delete_password_policy,
     /* db_free_policy */                    krb5_ldap_free_password_policy,
-    /* db_supported_realms */               krb5_ldap_supported_realms,
-    /* db_free_supported_realms */          krb5_ldap_free_supported_realms,
     /* errcode_2_string */                  krb5_ldap_errcode_2_string,
     /* release_errcode_string */            krb5_ldap_release_errcode_string,
     /* db_alloc */                          krb5_ldap_alloc,

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
index 0f7921074ca4c397ccdc6221aa42758d1e4b51e9..241037138d5bd088be7d25849d80f18af1771383 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
@@ -311,12 +311,6 @@ krb5_ldap_lock( krb5_context, int );
 krb5_error_code
 krb5_ldap_unlock( krb5_context );
 
-krb5_error_code
-krb5_ldap_supported_realms( krb5_context, char ** );
-
-krb5_error_code
-krb5_ldap_free_supported_realms( krb5_context, char ** );
-
 const char *
 krb5_ldap_errcode_2_string( krb5_context, long );
 

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
index c3cb185d0e5d875db4cf15de40b8d8baee623f67..188645bf7606104e3cb9ed3fed261acf9e48607e 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
@@ -1530,22 +1530,6 @@ krb5_ldap_unlock(krb5_context kcontext)
     return status;
 }
 
-krb5_error_code
-krb5_ldap_supported_realms(krb5_context kcontext, char **realms)
-{
-    krb5_error_code status = KRB5_PLUGIN_OP_NOTSUPP;
-    krb5_set_error_message(kcontext, status, "LDAP %s", error_message(status));
-    return status;
-}
-
-krb5_error_code
-krb5_ldap_free_supported_realms(krb5_context kcontext, char **realms)
-{
-    krb5_error_code status = KRB5_PLUGIN_OP_NOTSUPP;
-    krb5_set_error_message(kcontext, status, "LDAP %s", error_message(status));
-    return status;
-}
-
 const char *
 krb5_ldap_errcode_2_string(krb5_context kcontext, long err_code)
 {

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports b/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
index ade869cd422fa03c56c539354c8c83a0fc0df8e0..97ff385e72d420bf5501415391ef3dad6d6ddd3d 100644 (file)
--- a/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
+++ b/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
@@ -43,8 +43,6 @@ disjoint_members
 krb5_ldap_delete_realm_1
 krb5_ldap_lock
 krb5_ldap_unlock
-krb5_ldap_supported_realms
-krb5_ldap_free_supported_realms
 krb5_ldap_errcode_2_string
 krb5_ldap_release_errcode_string
 krb5_ldap_create