diff options
| author | Paul Park <pjpark@mit.edu> | 1995-07-31 20:03:54 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-07-31 20:03:54 +0000 |
| commit | 556aaf10700f3e327eb5375b424bca268d8edeaf (patch) | |
| tree | 3be24a86e9310bbebdbb306aca5af1146b8df7eb /src/admin/stash | |
| parent | 9a12a0af6c65e74fc4437bc19d54cff46bedd960 (diff) | |
| download | krb5-556aaf10700f3e327eb5375b424bca268d8edeaf.tar.gz krb5-556aaf10700f3e327eb5375b424bca268d8edeaf.tar.xz krb5-556aaf10700f3e327eb5375b424bca268d8edeaf.zip | |
Use new admin string conversion routines
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6366 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin/stash')
| -rw-r--r-- | src/admin/stash/ChangeLog | 4 | ||||
| -rw-r--r-- | src/admin/stash/kdb5_stash.c | 27 |
2 files changed, 24 insertions, 7 deletions
diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog index f0f9a9603..f06310e3e 100644 --- a/src/admin/stash/ChangeLog +++ b/src/admin/stash/ChangeLog @@ -1,4 +1,8 @@ +Mon Jul 31 15:49:17 EDT 1995 Paul Park (pjpark@mit.edu) + * kdb5_stash.c - Use kadm string conversion routines. + + Mon Jul 17 15:02:29 EDT 1995 Paul Park (pjpark@mit.edu) * configure.in - Add KADM library. * kdb5_stash.c - Change calling sequence to krb5_db_fetch_mkey(). Add diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c index 6d5157316..38712baa6 100644 --- a/src/admin/stash/kdb5_stash.c +++ b/src/admin/stash/kdb5_stash.c @@ -82,14 +82,18 @@ char *argv[]; realm = optarg; break; case 'k': - master_keyblock.keytype = atoi(optarg); - keytypedone++; + if (!krb5_string_to_keytype(optarg, &master_keyblock.keytype)) + keytypedone++; + else + com_err(argv[0], 0, "%s is an invalid keytype", optarg); break; case 'M': /* master key name in DB */ mkey_name = optarg; break; case 'e': - etype = atoi(optarg); + if (krb5_string_to_enctype(optarg, &etype)) + com_err(argv[0], 0, "%s is an invalid encryption type", + optarg); break; case 'f': keyfile = optarg; @@ -142,8 +146,12 @@ char *argv[]; master_keyblock.keytype = DEFAULT_KDC_KEYTYPE; if (!valid_keytype(master_keyblock.keytype)) { - com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, - "while setting up keytype %d", master_keyblock.keytype); + char tmp[32]; + if (krb5_keytype_to_string(master_keyblock.keytype, tmp, sizeof(tmp))) + com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, + "while setting up keytype %d", master_keyblock.keytype); + else + com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, tmp); exit(1); } @@ -151,8 +159,13 @@ char *argv[]; etype = DEFAULT_KDC_ETYPE; if (!valid_etype(etype)) { - com_err(argv[0], KRB5_PROG_ETYPE_NOSUPP, - "while setting up etype %d", etype); + char tmp[32]; + + if (krb5_enctype_to_string(etype, tmp, sizeof(tmp))) + com_err(argv[0], KRB5_PROG_ETYPE_NOSUPP, + "while setting up etype %d", etype); + else + com_err(argv[0], KRB5_PROG_ETYPE_NOSUPP, tmp); exit(1); } |