If no srvtab specified, then use squirreled admin key

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

diff --git a/src/kadmin/v5server/kadm5_defs.h b/src/kadmin/v5server/kadm5_defs.h
index ed62e863bb4d5850b009f7e9908b07bfa29e80a8..fb3e9c071b69173fcddeeab57901dfc5dbdb24cf 100644 (file)
--- a/src/kadmin/v5server/kadm5_defs.h
+++ b/src/kadmin/v5server/kadm5_defs.h
@@ -136,6 +136,7 @@ krb5_boolean key_pwd_is_weak
 krb5_db_entry *key_master_entry();
 char *key_master_realm();
 krb5_keytab key_keytab_id();
+krb5_keyblock *key_admin_key();
 
 /* srv_acl.c */
 krb5_error_code acl_init

diff --git a/src/kadmin/v5server/proto_serv.c b/src/kadmin/v5server/proto_serv.c
index 56ac92160daca459e642bdfef534a5b27a892322..73c6ce62fc28dbd29e21159e2a2e65a131a750f2 100644 (file)
--- a/src/kadmin/v5server/proto_serv.c
+++ b/src/kadmin/v5server/proto_serv.c
@@ -211,6 +211,11 @@ proto_serv(kcontext, my_id, cl_sock, sv_p, cl_p)
 
     DPRINT(DEBUG_PROTO, proto_debug_level,
           ("= %d:parse message(%d bytes)\n", my_id, in_data.length));
+    /*
+     * If we don't have a keytab, use our squirreled key.
+     */
+    if (!key_keytab_id())
+       krb5_auth_con_setuseruserkey(kcontext, auth_context, key_admin_key());
     /* Parse the AP_REQ message */
     if (kret = krb5_rd_req(kcontext,
                           &auth_context,