use default keytypes/etypes

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

diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index 4757fbb0c2a393550d003a968f57e232060957f9..0477c2cd894f6b33f6e9c0dc7bbf32c3c85fbd25 100644 (file)
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -162,7 +162,7 @@ char *argv[];
     }
 
     if (!keytypedone)
-       master_keyblock.keytype = KEYTYPE_DES;
+       master_keyblock.keytype = DEFAULT_KDC_KEYTYPE;
 
     if (!valid_keytype(master_keyblock.keytype)) {
        com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP,
@@ -171,7 +171,7 @@ char *argv[];
     }
 
     if (etype == 0xffff)
-       etype = krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype;
+       etype = DEFAULT_KDC_ETYPE;
 
     if (!valid_etype(etype)) {
        com_err(progname, KRB5_PROG_ETYPE_NOSUPP,

diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c
index acf100afccad0f556f203f99c76b764bc9dfa638..c9275210c2224b24b1dbb63e5cbaa48e18909c48 100644 (file)
--- a/src/admin/stash/kdb5_stash.c
+++ b/src/admin/stash/kdb5_stash.c
@@ -99,7 +99,7 @@ char *argv[];
     }
 
     if (!keytypedone)
-       master_keyblock.keytype = KEYTYPE_DES;
+       master_keyblock.keytype = DEFAULT_KDC_KEYTYPE;
 
     if (!valid_keytype(master_keyblock.keytype)) {
        com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP,
@@ -108,7 +108,7 @@ char *argv[];
     }
 
     if (etype == 0xffff)
-       etype = krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype;
+       etype = DEFAULT_KDC_ETYPE;
 
     if (!valid_etype(etype)) {
        com_err(argv[0], KRB5_PROG_ETYPE_NOSUPP,