svn rev #24158: trunk/src/ include/ lib/kdb/ plugins/kdb/db2/ plugins/kdb/ldap/ ...
ghudson@MIT.EDU
ghudson at MIT.EDU
Fri Jul 2 10:08:20 EDT 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=24158
Commit By: ghudson
Log Message:
ticket: 6749
status: open
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).
Changed Files:
U trunk/src/include/kdb.h
U trunk/src/lib/kdb/kdb5.c
U trunk/src/plugins/kdb/db2/db2_exp.c
U trunk/src/plugins/kdb/ldap/ldap_exp.c
U trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
U trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
U trunk/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
Modified: trunk/src/include/kdb.h
===================================================================
--- trunk/src/include/kdb.h 2010-07-02 03:23:21 UTC (rev 24157)
+++ trunk/src/include/kdb.h 2010-07-02 14:08:20 UTC (rev 24158)
@@ -447,10 +447,6 @@
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 @@
* 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
@@ -1137,17 +1133,6 @@
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
* implemented, libkdb5 will invoke it and call krb5_set_error_message with
Modified: trunk/src/lib/kdb/kdb5.c
===================================================================
--- trunk/src/lib/kdb/kdb5.c 2010-07-02 03:23:21 UTC (rev 24157)
+++ trunk/src/lib/kdb/kdb5.c 2010-07-02 14:08:20 UTC (rev 24158)
@@ -1120,38 +1120,6 @@
}
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)
{
Modified: trunk/src/plugins/kdb/db2/db2_exp.c
===================================================================
--- trunk/src/plugins/kdb/db2/db2_exp.c 2010-07-02 03:23:21 UTC (rev 24157)
+++ trunk/src/plugins/kdb/db2/db2_exp.c 2010-07-02 14:08:20 UTC (rev 24158)
@@ -249,8 +249,6 @@
/* 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,
Modified: trunk/src/plugins/kdb/ldap/ldap_exp.c
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_exp.c 2010-07-02 03:23:21 UTC (rev 24157)
+++ trunk/src/plugins/kdb/ldap/ldap_exp.c 2010-07-02 14:08:20 UTC (rev 24158)
@@ -69,8 +69,6 @@
/* 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,
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2010-07-02 03:23:21 UTC (rev 24157)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2010-07-02 14:08:20 UTC (rev 24158)
@@ -311,12 +311,6 @@
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 );
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c 2010-07-02 03:23:21 UTC (rev 24157)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c 2010-07-02 14:08:20 UTC (rev 24158)
@@ -1530,22 +1530,6 @@
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)
{
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports 2010-07-02 03:23:21 UTC (rev 24157)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports 2010-07-02 14:08:20 UTC (rev 24158)
@@ -43,8 +43,6 @@
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
More information about the cvs-krb5
mailing list