From 912d4caa379df94d4c82001bed40aa3858b525f0 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 6 Apr 2002 01:47:59 +0000 Subject: call krb5_c_ versions of enctype/cksumtype checking routines git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14367 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/dbutil/ChangeLog | 7 +++++++ src/kadmin/dbutil/kdb5_stash.c | 6 +++--- src/kadmin/dbutil/kdb5_util.c | 4 ++-- src/kadmin/dbutil/loadv4.c | 6 +++--- 4 files changed, 15 insertions(+), 8 deletions(-) (limited to 'src/kadmin') diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index de2ba00d7..af9b18496 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/ChangeLog @@ -1,3 +1,10 @@ +2002-04-05 Ken Raeburn + + * kdb5_stash.c (kdb5_stash): Call krb5_c_valid_enctype instead of + valid_enctype. + * kdb5_util.c (main, open_db_and_mkey): Likewise. + * loadv4.c (load_v4db): Likewise. + 2002-01-08 Sam Hartman * kdb5_create.c (kdb5_create): Load strong random data diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c index 0c6aed5ca..37db048ac 100644 --- a/src/kadmin/dbutil/kdb5_stash.c +++ b/src/kadmin/dbutil/kdb5_stash.c @@ -70,8 +70,8 @@ extern int close_policy_db; void kdb5_stash(argc, argv) -int argc; -char *argv[]; + int argc; + char *argv[]; { extern char *optarg; extern int optind; @@ -110,7 +110,7 @@ char *argv[]; } } - if (!valid_enctype(master_keyblock.enctype)) { + if (!krb5_c_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, diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c index d44f86714..bace2fae4 100644 --- a/src/kadmin/dbutil/kdb5_util.c +++ b/src/kadmin/dbutil/kdb5_util.c @@ -230,7 +230,7 @@ int main(argc, argv) master_keyblock.enctype = global_params.enctype; if ((master_keyblock.enctype != ENCTYPE_UNKNOWN) && - (!valid_enctype(master_keyblock.enctype))) { + (!krb5_c_valid_enctype(master_keyblock.enctype))) { com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, "while setting up enctype %d", master_keyblock.enctype); } @@ -369,7 +369,7 @@ static int open_db_and_mkey() /* If no encryption type is set, use the default */ if (master_keyblock.enctype == ENCTYPE_UNKNOWN) { master_keyblock.enctype = DEFAULT_KDC_ENCTYPE; - if (!valid_enctype(master_keyblock.enctype)) + if (!krb5_c_valid_enctype(master_keyblock.enctype)) com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP, "while setting up enctype %d", master_keyblock.enctype); diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c index 74710884c..7ddba43c0 100644 --- a/src/kadmin/dbutil/loadv4.c +++ b/src/kadmin/dbutil/loadv4.c @@ -154,8 +154,8 @@ static krb5_principal_data db_create_princ = { void load_v4db(argc, argv) -int argc; -char *argv[]; + int argc; + char *argv[]; { krb5_error_code retval; /* The kdb library will default to this, but it is convenient to @@ -247,7 +247,7 @@ char *argv[]; return; } - if (!valid_enctype(master_keyblock.enctype)) { + if (!krb5_c_valid_enctype(master_keyblock.enctype)) { com_err(PROGNAME, KRB5_PROG_KEYTYPE_NOSUPP, "while setting up enctype %d", master_keyblock.enctype); krb5_free_context(context); -- cgit