Use new admin string conversion routines

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

1 files changed, 19 insertions, 7 deletions

diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c
index ef243c6d6..9eed9c956 100644
--- a/src/admin/create/kdb5_create.c
+++ b/src/admin/create/kdb5_create.c
@@ -147,8 +147,10 @@ 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;
@@ -157,7 +159,9 @@ char *argv[];
 	    mkey_password = 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 '?':
 	default:
@@ -219,8 +223,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);
     }
 
@@ -228,8 +236,12 @@ 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);
     }
     krb5_use_cstype(context, &master_encblock, etype);