* cpw.c, dump.c, dumpv4.c, kdb5_edit.c, loadv4.c :

		s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

1 files changed, 16 insertions, 16 deletions

diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index 90a6b2bea2..98f6998d79 100644
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -78,7 +78,7 @@ usage(who, status)
     fprintf(stderr,
 	    "usage: %s [-d dbpathname] [-r realmname] [-R request ]\n",
 	    who);
-    fprintf(stderr, "\t [-k keytype] [-M mkeyname]\n");
+    fprintf(stderr, "\t [-k enctype] [-M mkeyname]\n");
     exit(status);
 }
 
@@ -107,7 +107,7 @@ char *kdb5_edit_Init(argc, argv)
     krb5_error_code retval;
     char *dbname = (char *) NULL;
     char *defrealm;
-    int keytypedone = 0;
+    int enctypedone = 0;
     extern krb5_kt_ops krb5_ktf_writable_ops;
     char	*request = NULL;
     krb5_realm_params *rparams;
@@ -147,10 +147,10 @@ char *kdb5_edit_Init(argc, argv)
 	    request = optarg;
 	    break;
 	case 'k':
-	    if (!krb5_string_to_keytype(optarg, &master_keyblock.keytype))
-		keytypedone++;
+	    if (!krb5_string_to_enctype(optarg, &master_keyblock.enctype))
+		enctypedone++;
 	    else
-		com_err(argv[0], 0, "%s is an invalid keytype", optarg);
+		com_err(argv[0], 0, "%s is an invalid enctype", optarg);
 	    break;
 	case 'M':			/* master key name in DB */
 	    mkey_name = optarg;
@@ -191,9 +191,9 @@ char *kdb5_edit_Init(argc, argv)
 	    mkey_name = strdup(rparams->realm_mkey_name);
 
 	/* Get the value for the master key type */
-	if (rparams->realm_keytype_valid && !keytypedone) {
-	    master_keyblock.keytype = rparams->realm_keytype;
-	    keytypedone++;
+	if (rparams->realm_enctype_valid && !enctypedone) {
+	    master_keyblock.enctype = rparams->realm_enctype;
+	    enctypedone++;
 	}
 
 	/* Get the value for the stashfile */
@@ -234,20 +234,20 @@ char *kdb5_edit_Init(argc, argv)
     if (!dbname)
 	dbname = DEFAULT_KDB_FILE;
 
-    if (!keytypedone)
-	master_keyblock.keytype = DEFAULT_KDC_KEYTYPE;
+    if (!enctypedone)
+	master_keyblock.enctype = DEFAULT_KDC_ENCTYPE;
 
-    if (!valid_keytype(master_keyblock.keytype)) {
+    if (!valid_enctype(master_keyblock.enctype)) {
 	char tmp[32];
-	if (krb5_keytype_to_string(master_keyblock.keytype, tmp, sizeof(tmp)))
+	if (krb5_enctype_to_string(master_keyblock.enctype, tmp, sizeof(tmp)))
 	    com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP,
-		    "while setting up keytype %d", master_keyblock.keytype);
+		    "while setting up enctype %d", master_keyblock.enctype);
 	else
 	    com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, tmp);
 	exit(1);
     }
 
-    krb5_use_keytype(edit_context, &master_encblock, master_keyblock.keytype);
+    krb5_use_enctype(edit_context, &master_encblock, master_keyblock.enctype);
 
     if (cur_realm) {
 	if ((retval = krb5_set_default_realm(edit_context, cur_realm))) {
@@ -460,7 +460,7 @@ set_dbname_help(pname, dbname)
 	    return(1);
 	}
 	retval = krb5_string_to_key(edit_context, &master_encblock, 
-				    master_keyblock.keytype,
+				    master_keyblock.enctype,
 				    &master_keyblock, &pwd, &scratch);
 	if (retval) {
 	    com_err(pname, retval,
@@ -803,7 +803,7 @@ void extract_v4_srvtab(argc, argv)
 	    exit_status++;
 	    goto cleanall;
 	}
-	if (key.keytype != 1) {
+	if (key.enctype != 1) {
 		com_err(argv[0], 0, "%s does not have a DES key!", pname);
 		exit_status++;
 		memset((char *)key.contents, 0, key.length);