diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-03-04 00:38:48 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-03-04 00:38:48 +0000 |
| commit | f938afd6b6f61a96a0aa72c57a280aa721566fe6 (patch) | |
| tree | 2730b993561ed9c8c884d7b8cf78c955485fcd94 /src/lib/kadm5 | |
| parent | 8a42038eaf80bd1da88d909a5196157ae41973b9 (diff) | |
| download | krb5-f938afd6b6f61a96a0aa72c57a280aa721566fe6.tar.gz krb5-f938afd6b6f61a96a0aa72c57a280aa721566fe6.tar.xz krb5-f938afd6b6f61a96a0aa72c57a280aa721566fe6.zip | |
Remove admin_keytab references in code and docs
The admin keytab hasn't been needed or used by kadmind since 1.4
(except possibly by legacy admin daemons which we no longer ship).
Eliminate remaining references to it in code, test cases, and
documentation.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25729 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kadm5')
| -rw-r--r-- | src/lib/kadm5/admin.h | 3 | ||||
| -rw-r--r-- | src/lib/kadm5/alt_prof.c | 12 | ||||
| -rw-r--r-- | src/lib/kadm5/clnt/client_init.c | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h index d1a76f737d..4ce56c6261 100644 --- a/src/lib/kadm5/admin.h +++ b/src/lib/kadm5/admin.h @@ -134,7 +134,7 @@ typedef long kadm5_ret_t; #define KADM5_CONFIG_MAX_RLIFE 0x00000010 #define KADM5_CONFIG_EXPIRATION 0x00000020 #define KADM5_CONFIG_FLAGS 0x00000040 -#define KADM5_CONFIG_ADMIN_KEYTAB 0x00000080 +/*#define KADM5_CONFIG_ADMIN_KEYTAB 0x00000080*/ #define KADM5_CONFIG_STASH_FILE 0x00000100 #define KADM5_CONFIG_ENCTYPE 0x00000200 #define KADM5_CONFIG_ADBNAME 0x00000400 @@ -240,7 +240,6 @@ typedef struct _kadm5_config_params { file. */ char * dbname; - char * admin_keytab; char * acl_file; char * dict_file; diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c index 35f078e1ac..f182ce6439 100644 --- a/src/lib/kadm5/alt_prof.c +++ b/src/lib/kadm5/alt_prof.c @@ -616,17 +616,6 @@ krb5_error_code kadm5_get_config_params(context, use_kdc_config, GET_STRING_PARAM(dbname, KADM5_CONFIG_DBNAME, KRB5_CONF_DATABASE_NAME, DEFAULT_KDB_FILE); - /* Get the value for the admin (policy) database lock file*/ - if (!GET_STRING_PARAM(admin_keytab, KADM5_CONFIG_ADMIN_KEYTAB, - KRB5_CONF_ADMIN_KEYTAB, NULL)) { - const char *s = getenv("KRB5_KTNAME"); - if (s == NULL) - s = DEFAULT_KADM5_KEYTAB; - params.admin_keytab = strdup(s); - if (params.admin_keytab) - params.mask |= KADM5_CONFIG_ADMIN_KEYTAB; - } - /* Get the name of the acl file */ GET_STRING_PARAM(acl_file, KADM5_CONFIG_ACL_FILE, KRB5_CONF_ACL_FILE, DEFAULT_KADM5_ACL_FILE); @@ -862,7 +851,6 @@ kadm5_free_config_params(context, params) free(params->stash_file); free(params->keysalts); free(params->admin_server); - free(params->admin_keytab); free(params->dict_file); free(params->acl_file); free(params->realm); diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c index a1d20fb7e0..a8abebfcfb 100644 --- a/src/lib/kadm5/clnt/client_init.c +++ b/src/lib/kadm5/clnt/client_init.c @@ -236,8 +236,7 @@ init_any(krb5_context context, char *client_name, enum init_type init_type, #define ILLEGAL_PARAMS (KADM5_CONFIG_DBNAME | KADM5_CONFIG_ADBNAME | \ KADM5_CONFIG_ADB_LOCKFILE | \ KADM5_CONFIG_ACL_FILE | KADM5_CONFIG_DICT_FILE \ - | KADM5_CONFIG_ADMIN_KEYTAB | \ - KADM5_CONFIG_STASH_FILE | \ + | KADM5_CONFIG_STASH_FILE | \ KADM5_CONFIG_MKEY_NAME | KADM5_CONFIG_ENCTYPE \ | KADM5_CONFIG_MAX_LIFE | \ KADM5_CONFIG_MAX_RLIFE | \ |