diff options
| author | Richard Basch <probe@mit.edu> | 1995-12-12 02:34:40 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1995-12-12 02:34:40 +0000 |
| commit | ae1ec1e7d637b1778f6a693f2bc5c4ac43521ef0 (patch) | |
| tree | 833278781f5d73bd4ae71c268dfca391d1fe9856 /src/admin/edit | |
| parent | 3ea45cee5283e90976c44e763ccbd081b2c093af (diff) | |
| download | krb5-ae1ec1e7d637b1778f6a693f2bc5c4ac43521ef0.tar.gz krb5-ae1ec1e7d637b1778f6a693f2bc5c4ac43521ef0.tar.xz krb5-ae1ec1e7d637b1778f6a693f2bc5c4ac43521ef0.zip | |
* kdb5_edit.c: Use the master key enctype from the stash file if none
is specified (set the keyblock enctype to NULL).
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7197 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin/edit')
| -rw-r--r-- | src/admin/edit/kdb5_edit.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c index 1871d3eb38..f56af7e76f 100644 --- a/src/admin/edit/kdb5_edit.c +++ b/src/admin/edit/kdb5_edit.c @@ -247,20 +247,27 @@ char *kdb5_edit_Init(argc, argv) if (!dbname) dbname = DEFAULT_KDB_FILE; - if (!enctypedone) - master_keyblock.enctype = DEFAULT_KDC_ENCTYPE; - - if (!valid_enctype(master_keyblock.enctype)) { - char tmp[32]; - if (krb5_enctype_to_string(master_keyblock.enctype, tmp, sizeof(tmp))) - com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, - "while setting up enctype %d", master_keyblock.enctype); + if (!enctypedone) { + if (manual_mkey) + master_keyblock.enctype = DEFAULT_KDC_ENCTYPE; else - com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, tmp); - exit(1); + master_keyblock.enctype = NULL; } - krb5_use_enctype(edit_context, &master_encblock, master_keyblock.enctype); + if (master_keyblock.enctype) { + if (!valid_enctype(master_keyblock.enctype)) { + char tmp[32]; + if (krb5_enctype_to_string(master_keyblock.enctype, + tmp, sizeof(tmp))) + com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, + "while setting up enctype %d", master_keyblock.enctype); + else + com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, tmp); + exit(1); + } + krb5_use_enctype(edit_context, &master_encblock, + master_keyblock.enctype); + } if (cur_realm) { if ((retval = krb5_set_default_realm(edit_context, cur_realm))) { |