* 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

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index c7238e01670872df89c63058c3a35589d137b6fe..6c3d72be0511da910d4665abceba08ae9e719c1a 100644 (file)
--- 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 373500398dfde92eca8c2c8748ff3292b9891fec..290af20eebbc2774459a4ff51de39f3a58034477 100644 (file)
--- 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;