* admin_server.c: use params.admin_keytab instead of a hard-coded

 	value [krb5-admin/30]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9299 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 8fdc9415e657f6d68507c8550f64f2941294846e..f83cf3cccbdc9301983860f3feabc80384d48ad1 100644 (file)
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 21 17:20:32 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+       * admin_server.c: use params.admin_keytab instead of a hard-coded
+       value [krb5-admin/30]
+
 Thu Sep 26 17:54:33 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * admin_server.c (process_client): allow keytab to be specified on

diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c
index e9b09bea1b06cf72cd03c01f7bb9a9c80581e63f..fb6ff7d05611f299ae7080a30e5b1484cafe9462 100644 (file)
--- a/src/kadmin/v4server/admin_server.c
+++ b/src/kadmin/v4server/admin_server.c
@@ -66,11 +66,6 @@ admin_params prm;            /* The command line parameters struct */
 char prog[32];                 /* WHY IS THIS NEEDED??????? */
 char *progname = prog;
 char *acldir = DEFAULT_ACL_DIR;
-#ifdef OVSEC_KADM
-char *keytab = "FILE:/krb5/ovsec_adm.srvtab";
-#else
-char *keytab = NULL;
-#endif
 char krbrlm[REALM_SZ];
 extern Kadm_Server server_parm;
 krb5_context kadm_context;
@@ -153,7 +148,10 @@ char *argv[];
            (void) strncpy(krbrlm, optarg, sizeof(krbrlm) - 1);
            break;
         case 'k':
-           keytab = optarg;
+#ifdef OVSEC_KADM
+           params.admin_keytab = optarg;
+           params.mask |= KADM5_CONFIG_ADMIN_KEYTAB;
+#endif
            break;
         case 'h':                      /* get help on using admin_server */
        default:
@@ -406,7 +404,7 @@ void process_client(fd, who)
            server_parm.sinst, server_parm.krbrlm);
 
     retval = ovsec_kadm_init_with_skey(service_name,
-                                      keytab,
+                                      params.admin_keytab,
                                       OVSEC_KADM_ADMIN_SERVICE, krbrlm,
                                       OVSEC_KADM_STRUCT_VERSION,
                                       OVSEC_KADM_API_VERSION_1,