svn rev #24315: trunk/src/ include/ plugins/kdb/db2/ plugins/kdb/ldap/ plugins/kdb/ldap/libkdb_ldap/
hartmans@MIT.EDU
hartmans at MIT.EDU
Wed Sep 15 13:13:34 EDT 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=24315
Commit By: hartmans
Log Message:
kdb: remove get/set_mkey_list
Remove dead code from DAL and kdb plugins.
Changed Files:
U trunk/src/include/kdb.h
U trunk/src/plugins/kdb/db2/db2_exp.c
U trunk/src/plugins/kdb/db2/kdb_db2.c
U trunk/src/plugins/kdb/db2/kdb_db2.h
U trunk/src/plugins/kdb/ldap/ldap_exp.c
U trunk/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
U trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
D trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_fetch_mkey.c
U trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.h
Modified: trunk/src/include/kdb.h
===================================================================
--- trunk/src/include/kdb.h 2010-09-15 17:13:23 UTC (rev 24314)
+++ trunk/src/include/kdb.h 2010-09-15 17:13:34 UTC (rev 24315)
@@ -1013,23 +1013,6 @@
void (*free)(krb5_context kcontext, void *ptr);
/*
- * Optional: Inform the module of the master key list. The module may
- * remember an alias to the provided memory. This function is called at
- * startup by the KDC and kadmind with the value returned by
- * fetch_master_key_list.
- */
- krb5_error_code (*set_master_key_list)(krb5_context kcontext,
- krb5_keylist_node *keylist);
-
- /*
- * Optional: Retrieve an alias to the master key list as previously set by
- * set_master_key_list. This function is used by the KDB keytab
- * implementation in libkdb5, which is used by kadmind.
- */
- krb5_error_code (*get_master_key_list)(krb5_context kcontext,
- krb5_keylist_node **keylist);
-
- /*
* Optional with default: Retrieve a master keyblock from the stash file
* db_args, filling in *key and *kvno. mname is the name of the master
* principal for the realm.
Modified: trunk/src/plugins/kdb/db2/db2_exp.c
===================================================================
--- trunk/src/plugins/kdb/db2/db2_exp.c 2010-09-15 17:13:23 UTC (rev 24314)
+++ trunk/src/plugins/kdb/db2/db2_exp.c 2010-09-15 17:13:34 UTC (rev 24315)
@@ -168,14 +168,6 @@
( krb5_context kcontext, osa_policy_ent_t entry ),
(kcontext, entry));
-WRAP_K (krb5_db2_set_mkey_list,
- ( krb5_context kcontext, krb5_keylist_node *keylist),
- (kcontext, keylist));
-
-WRAP_K (krb5_db2_get_mkey_list,
- ( krb5_context context, krb5_keylist_node **keylist),
- (context, keylist));
-
WRAP_K (krb5_db2_promote_db,
( krb5_context kcontext, char *conf_section, char **db_args ),
(kcontext, conf_section, db_args));
@@ -241,8 +233,6 @@
/* free_policy */ wrap_krb5_db2_free_policy,
/* alloc */ krb5_db2_alloc,
/* free */ krb5_db2_free,
- /* set_master_key_list */ wrap_krb5_db2_set_mkey_list,
- /* get_master_key_list */ wrap_krb5_db2_get_mkey_list,
/* blah blah blah */ 0,0,0,0,0,
/* promote_db */ wrap_krb5_db2_promote_db,
0, 0, 0, 0,
Modified: trunk/src/plugins/kdb/db2/kdb_db2.c
===================================================================
--- trunk/src/plugins/kdb/db2/kdb_db2.c 2010-09-15 17:13:23 UTC (rev 24314)
+++ trunk/src/plugins/kdb/db2/kdb_db2.c 2010-09-15 17:13:34 UTC (rev 24315)
@@ -436,33 +436,8 @@
return retval;
}
-krb5_error_code
-krb5_db2_set_mkey_list(krb5_context context, krb5_keylist_node *key_list)
-{
- krb5_db2_context *db_ctx;
- if (!k5db2_inited(context))
- return (KRB5_KDB_DBNOTINITED);
- db_ctx = context->dal_handle->db_context;
- db_ctx->db_master_key_list = key_list;
- return 0;
-}
-
-krb5_error_code
-krb5_db2_get_mkey_list(krb5_context context, krb5_keylist_node **key_list)
-{
- krb5_db2_context *db_ctx;
-
- if (!k5db2_inited(context))
- return (KRB5_KDB_DBNOTINITED);
-
- db_ctx = context->dal_handle->db_context;
- *key_list = db_ctx->db_master_key_list;
-
- return 0;
-}
-
/* Return successfully if the db2 name set in context can be opened. */
static krb5_error_code
check_openable(krb5_context context)
Modified: trunk/src/plugins/kdb/db2/kdb_db2.h
===================================================================
--- trunk/src/plugins/kdb/db2/kdb_db2.h 2010-09-15 17:13:23 UTC (rev 24314)
+++ trunk/src/plugins/kdb/db2/kdb_db2.h 2010-09-15 17:13:34 UTC (rev 24315)
@@ -43,7 +43,6 @@
int db_locks_held; /* Number of times locked */
int db_lock_mode; /* Last lock mode, e.g. greatest*/
krb5_boolean db_nb_locks; /* [Non]Blocking lock modes */
- krb5_keylist_node *db_master_key_list; /* Master key list of database */
osa_adb_policy_t policy_db;
krb5_boolean tempdb;
krb5_boolean disable_last_success;
@@ -79,12 +78,6 @@
krb5_error_code krb5_db2_close_database(krb5_context);
krb5_error_code
-krb5_db2_set_mkey_list(krb5_context context, krb5_keylist_node *keylist);
-
-krb5_error_code
-krb5_db2_get_mkey_list(krb5_context context, krb5_keylist_node **keylist);
-
-krb5_error_code
krb5_db2_delete_principal(krb5_context context,
krb5_const_principal searchfor);
Modified: trunk/src/plugins/kdb/ldap/ldap_exp.c
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_exp.c 2010-09-15 17:13:23 UTC (rev 24314)
+++ trunk/src/plugins/kdb/ldap/ldap_exp.c 2010-09-15 17:13:34 UTC (rev 24315)
@@ -72,8 +72,6 @@
/* alloc */ krb5_ldap_alloc,
/* free */ krb5_ldap_free,
/* optional functions */
- /* set_master_key_list */ krb5_ldap_set_mkey_list,
- /* get_master_key_list */ krb5_ldap_get_mkey_list,
/* fetch_master_key */ NULL /* krb5_ldap_fetch_mkey */,
/* fetch_master_key_list */ NULL,
/* store_master_key_list */ NULL,
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in 2010-09-15 17:13:23 UTC (rev 24314)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in 2010-09-15 17:13:34 UTC (rev 24315)
@@ -50,7 +50,6 @@
$(srcdir)/ldap_services.c \
$(srcdir)/ldap_service_rights.c \
$(srcdir)/princ_xdr.c \
- $(srcdir)/ldap_fetch_mkey.c \
$(srcdir)/ldap_service_stash.c \
$(srcdir)/kdb_xdr.c \
$(srcdir)/ldap_err.c \
@@ -71,7 +70,6 @@
ldap_services.o \
ldap_service_rights.o \
princ_xdr.o \
- ldap_fetch_mkey.o \
ldap_service_stash.o \
kdb_xdr.o \
ldap_err.o \
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2010-09-15 17:13:23 UTC (rev 24314)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2010-09-15 17:13:34 UTC (rev 24315)
@@ -266,12 +266,6 @@
krb5_ldap_free( krb5_context kcontext, void *ptr );
krb5_error_code
-krb5_ldap_get_mkey_list (krb5_context context, krb5_keylist_node **key_list);
-
-krb5_error_code
-krb5_ldap_set_mkey_list(krb5_context, krb5_keylist_node *);
-
-krb5_error_code
krb5_ldap_create(krb5_context , char *, char **);
krb5_error_code
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.h
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.h 2010-09-15 17:13:23 UTC (rev 24314)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.h 2010-09-15 17:13:34 UTC (rev 24315)
@@ -68,7 +68,6 @@
char **adminservers;
char **passwdservers;
krb5_tl_data *tl_data;
- krb5_keylist_node *mkey_list; /* all master keys in use for the realm */
long mask;
} krb5_ldap_realm_params;
More information about the cvs-krb5
mailing list