diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-03-07 05:24:48 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-03-07 05:24:48 +0000 |
| commit | 1cc260646269d7252ea4feb927d84d71908f2fcc (patch) | |
| tree | 3508e72929c967dcea0f2d943d95e11790fd8787 /src | |
| parent | 03c2f9b48cef58567b6298fbaa3e9c4519976b7a (diff) | |
| download | krb5-1cc260646269d7252ea4feb927d84d71908f2fcc.tar.gz krb5-1cc260646269d7252ea4feb927d84d71908f2fcc.tar.xz krb5-1cc260646269d7252ea4feb927d84d71908f2fcc.zip | |
* ovsec_kadmd.c (REQUIRED_PARAMS): Remove
KADM5_CONFIG_ADMIN_KEYTAB.
(do_schpw): Use kdb keytab.
ticket: 1372
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15265 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin/server/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kadmin/server/ovsec_kadmd.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index c7238e0167..6c3d72be05 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,9 @@ +2003-03-07 Tom Yu <tlyu@mit.edu> + + * ovsec_kadmd.c (REQUIRED_PARAMS): Remove + KADM5_CONFIG_ADMIN_KEYTAB. + (do_schpw): Use kdb keytab. + 2003-03-05 Tom Yu <tlyu@mit.edu> * Makefile.in (LOCALINCLUDES): Add gssapi directories in order to diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c index 373500398d..290af20eeb 100644 --- a/src/kadmin/server/ovsec_kadmd.c +++ b/src/kadmin/server/ovsec_kadmd.c @@ -298,8 +298,7 @@ int main(int argc, char *argv[]) exit(1); } -#define REQUIRED_PARAMS (KADM5_CONFIG_REALM | KADM5_CONFIG_ACL_FILE | \ - KADM5_CONFIG_ADMIN_KEYTAB) +#define REQUIRED_PARAMS (KADM5_CONFIG_REALM | KADM5_CONFIG_ACL_FILE) if ((params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) { krb5_klog_syslog(LOG_ERR, "%s: Missing required configuration values " @@ -1079,7 +1078,7 @@ void do_schpw(int s1, kadm5_config_params *params) return; } - if ((ret = krb5_kt_resolve(context, params->admin_keytab, &kt))) { + if ((ret = krb5_kt_resolve(context, "KDB:", &kt))) { krb5_klog_syslog(LOG_ERR, "chpw: Couldn't open admin keytab %s", error_message(ret)); return; |