diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-07-02 17:13:40 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-07-02 17:13:40 +0000 |
| commit | 3dd263c9e18f52a115ab16213c37ee4132d56961 (patch) | |
| tree | d2606d63e2c0cb4a87d33e9bab7eb75ce0ae8dc5 /src/lib | |
| parent | cd332f86e3559fa13eaad7b33485fd1047fcd16c (diff) | |
| download | krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.tar.gz krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.tar.xz krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.zip | |
Remove the set_master_key and get_master_key DAL interfaces and their
corresponding libkdb5 APIs, as they were not productively used. In
kdb5_ldap_util, stop using the realm data's mkey field as a container
to communicate the master key to static helper functions, since the
field no longer exists.
ticket: 6749
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24162 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm5/srv/libkadm5srv_mit.exports | 1 | ||||
| -rw-r--r-- | src/lib/kdb/kdb5.c | 35 | ||||
| -rw-r--r-- | src/lib/kdb/kdb_default.c | 15 | ||||
| -rw-r--r-- | src/lib/kdb/libkdb5.exports | 2 |
4 files changed, 0 insertions, 53 deletions
diff --git a/src/lib/kadm5/srv/libkadm5srv_mit.exports b/src/lib/kadm5/srv/libkadm5srv_mit.exports index 7ba5c1a91c..fa8d69c51c 100644 --- a/src/lib/kadm5/srv/libkadm5srv_mit.exports +++ b/src/lib/kadm5/srv/libkadm5srv_mit.exports @@ -84,7 +84,6 @@ krb5_string_to_flags krb5_string_to_keysalts krb5_match_config_pattern master_db -master_keyblock master_keylist master_princ osa_free_princ_ent diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index 2be54c4acc..bfcdbd6af9 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c @@ -246,12 +246,8 @@ clean_n_exit: static void kdb_setup_opt_functions(db_library lib) { - if (lib->vftabl.set_master_key == NULL) - lib->vftabl.set_master_key = kdb_def_set_mkey; if (lib->vftabl.set_master_key_list == NULL) lib->vftabl.set_master_key_list = kdb_def_set_mkey_list; - if (lib->vftabl.get_master_key == NULL) - lib->vftabl.get_master_key = kdb_def_get_mkey; if (lib->vftabl.get_master_key_list == NULL) lib->vftabl.get_master_key_list = kdb_def_get_mkey_list; if (lib->vftabl.fetch_master_key == NULL) @@ -1078,25 +1074,6 @@ krb5_db_iterate(krb5_context kcontext, } krb5_error_code -krb5_db_set_master_key_ext(krb5_context kcontext, - char *pwd, krb5_keyblock * key) -{ - krb5_error_code status = 0; - kdb_vftabl *v; - - status = get_vftabl(kcontext, &v); - if (status) - return status; - return v->set_master_key(kcontext, pwd, key); -} - -krb5_error_code -krb5_db_set_mkey(krb5_context context, krb5_keyblock * key) -{ - return krb5_db_set_master_key_ext(context, NULL, key); -} - -krb5_error_code krb5_db_set_mkey_list(krb5_context kcontext, krb5_keylist_node * keylist) { @@ -1110,18 +1087,6 @@ krb5_db_set_mkey_list(krb5_context kcontext, } krb5_error_code -krb5_db_get_mkey(krb5_context kcontext, krb5_keyblock ** key) -{ - krb5_error_code status = 0; - kdb_vftabl *v; - - status = get_vftabl(kcontext, &v); - if (status) - return status; - return v->get_master_key(kcontext, key); -} - -krb5_error_code krb5_db_get_mkey_list(krb5_context kcontext, krb5_keylist_node ** keylist) { krb5_error_code status = 0; diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c index 225a5074e1..545d503602 100644 --- a/src/lib/kdb/kdb_default.c +++ b/src/lib/kdb/kdb_default.c @@ -617,21 +617,6 @@ clean_n_exit: return retval; } -krb5_error_code kdb_def_set_mkey ( krb5_context kcontext, - char *pwd, - krb5_keyblock *key ) -{ - /* printf("default set master key\n"); */ - return 0; -} - -krb5_error_code kdb_def_get_mkey ( krb5_context kcontext, - krb5_keyblock **key ) -{ - /* printf("default get master key\n"); */ - return 0; -} - krb5_error_code kdb_def_set_mkey_list ( krb5_context kcontext, krb5_keylist_node *keylist ) { diff --git a/src/lib/kdb/libkdb5.exports b/src/lib/kdb/libkdb5.exports index 8f0644beff..c9880982dd 100644 --- a/src/lib/kdb/libkdb5.exports +++ b/src/lib/kdb/libkdb5.exports @@ -13,7 +13,6 @@ krb5_db_fini krb5_db_free_principal krb5_db_get_age krb5_db_get_key_data_kvno -krb5_db_get_mkey krb5_db_get_mkey_list krb5_db_get_context krb5_db_get_principal @@ -23,7 +22,6 @@ krb5_db_iterate krb5_db_lock krb5_db_put_principal krb5_db_set_context -krb5_db_set_mkey krb5_db_set_mkey_list krb5_db_setup_mkey_name krb5_db_unlock |