diff options
| author | Paul Park <pjpark@mit.edu> | 1995-06-01 18:55:21 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-06-01 18:55:21 +0000 |
| commit | e5fad988912f911b8e61010272286cb3eee21ef5 (patch) | |
| tree | b98bc6d392f9ba96d9c518c3a956816824551d36 /src/kadmin/v5server | |
| parent | 731a91787abb8a4a69affbab16b80aa830fe1b83 (diff) | |
| download | krb5-e5fad988912f911b8e61010272286cb3eee21ef5.tar.gz krb5-e5fad988912f911b8e61010272286cb3eee21ef5.tar.xz krb5-e5fad988912f911b8e61010272286cb3eee21ef5.zip | |
If no srvtab specified, then use squirreled admin key
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5931 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/v5server')
| -rw-r--r-- | src/kadmin/v5server/kadm5_defs.h | 1 | ||||
| -rw-r--r-- | src/kadmin/v5server/proto_serv.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/kadmin/v5server/kadm5_defs.h b/src/kadmin/v5server/kadm5_defs.h index ed62e863b..fb3e9c071 100644 --- 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 56ac92160..73c6ce62f 100644 --- 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, |