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/kadmin/testing | |
| 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/kadmin/testing')
| -rw-r--r-- | src/kadmin/testing/proto/kdc.conf.proto | 1 | ||||
| -rw-r--r-- | src/kadmin/testing/tcl/util.t | 2 | ||||
| -rw-r--r-- | src/kadmin/testing/util/tcl_kadm5.c | 7 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/kadmin/testing/proto/kdc.conf.proto b/src/kadmin/testing/proto/kdc.conf.proto index 6f9edeb5b..943270d98 100644 --- a/src/kadmin/testing/proto/kdc.conf.proto +++ b/src/kadmin/testing/proto/kdc.conf.proto @@ -5,7 +5,6 @@ __REALM__ = { profile = __K5ROOT__/krb5.conf database_name = __K5ROOT__/kdb5 - admin_keytab = __K5ROOT__/ovsec_adm.srvtab key_stash_file = __K5ROOT__/.k5.__REALM__ acl_file = __K5ROOT__/ovsec_adm.acl dict_file = __K5ROOT__/ovsec_adm.dict diff --git a/src/kadmin/testing/tcl/util.t b/src/kadmin/testing/tcl/util.t index 772160990..6751f89e6 100644 --- a/src/kadmin/testing/tcl/util.t +++ b/src/kadmin/testing/tcl/util.t @@ -29,8 +29,6 @@ proc config_params {masks values} { "KADM5_CONFIG_ADBNAME" {set params [lreplace $params 5 5 $value]} "KADM5_CONFIG_ADB_LOCKFILE" { set params [lreplace $params 6 6 $value]} - "KADM5_CONFIG_ADMIN_KEYTAB" { - set params [lreplace $params 7 7 $value]} "KADM5_CONFIG_ACL_FILE" {set params [lreplace $params 8 8 $value]} "KADM5_CONFIG_DICT_FILE" { set params [lreplace $params 9 9 $value]} diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c index b33cf0a0f..0d9c7f11d 100644 --- a/src/kadmin/testing/util/tcl_kadm5.c +++ b/src/kadmin/testing/util/tcl_kadm5.c @@ -86,7 +86,6 @@ static struct flagval config_mask_flags[] = { {"KADM5_CONFIG_MAX_RLIFE", KADM5_CONFIG_MAX_RLIFE}, {"KADM5_CONFIG_EXPIRATION", KADM5_CONFIG_EXPIRATION}, {"KADM5_CONFIG_FLAGS", KADM5_CONFIG_FLAGS}, - {"KADM5_CONFIG_ADMIN_KEYTAB", KADM5_CONFIG_ADMIN_KEYTAB}, {"KADM5_CONFIG_STASH_FILE", KADM5_CONFIG_STASH_FILE}, {"KADM5_CONFIG_ENCTYPE", KADM5_CONFIG_ENCTYPE}, {"KADM5_CONFIG_ADBNAME", KADM5_CONFIG_ADBNAME}, @@ -1033,11 +1032,7 @@ static int parse_config_params(Tcl_Interp *interp, char *list, } /* Ignore argv[5], which used to set the admin_dbname field. */ /* Ignore argv[6], which used to set the admin_lockfile field. */ - if ((retcode = parse_str(interp, argv[7], ¶ms->admin_keytab)) != TCL_OK) { - Tcl_AppendElement(interp, "while parsing admin_keytab name"); - retcode = TCL_ERROR; - goto finished; - } + /* Ignore argv[7], which used to set the admin_keytab field. */ if ((retcode = parse_str(interp, argv[8], ¶ms->acl_file)) != TCL_OK) { Tcl_AppendElement(interp, "while parsing acl_file name"); retcode = TCL_ERROR; |