From: Paul Park <pjpark@mit.edu>
Date: Mon, 17 Jul 1995 19:39:02 +0000 (+0000)
Subject: Fix handling of default etype
X-Git-Tag: krb5-1.0-beta6~1511
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6fbfae47917d0af7d43d04500c51278fe8b50f77;p=krb5.git

Fix handling of default etype

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

diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index b390de739..bc5e24ad2 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,4 +1,10 @@
 
+Mon Jul 17 15:23:24 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* kdb5_mkdums.c - Change setting of defaulted keytype to be DEFAULT_
+		KDC_ETYPE instead of using the keytype array to find the
+		etype.
+
+
 Wed Jul 12 12:31:27 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* configure.in - Remove V5_USE_SHARED_LIB.
 
diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index e801643b8..05b93e385 100644
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -182,7 +182,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,
@@ -362,7 +362,7 @@ char *dbname;
 	free(scratch.data);
     } else {
 	if (retval = krb5_db_fetch_mkey(test_context, master_princ, &master_encblock,
-					manual_mkey, FALSE, 0,
+					manual_mkey, FALSE, (char *) NULL, 0,
 					&master_keyblock)) {
 	    com_err(pname, retval, "while reading master key");
 	    return(1);
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index c39c2aa34..5edc19280 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,4 +1,10 @@
 
+Mon Jul 17 15:25:03 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* kdb5_verify.c - Change setting of defaulted keytype to be DEFAULT_
+		KDC_ETYPE instead of using the keytype array to find the
+		etype.
+
+
 Wed Jul 12 12:33:00 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* configure.in - Remove V5_USE_SHARED_LIB.
 
diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
index ffd61b5bb..696ad9e4d 100644
--- a/src/tests/verify/kdb5_verify.c
+++ b/src/tests/verify/kdb5_verify.c
@@ -175,7 +175,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,
@@ -413,7 +413,7 @@ set_dbname_help(context, pname, dbname)
 	free(scratch.data);
     } else {
 	if (retval = krb5_db_fetch_mkey(context, master_princ, &master_encblock,
-					manual_mkey, FALSE, 0,
+					manual_mkey, FALSE, (char *) NULL, 0,
 					&master_keyblock)) {
 	    com_err(pname, retval, "while reading master key");
 	    return(1);