need to use 0xffff rather than -1 since the type is unsigned.

this makes defaulting based on keytype work again.

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

diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index c9daa7233c154828c10eb7aa5df292d42f2057f3..4757fbb0c2a393550d003a968f57e232060957f9 100644 (file)
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -111,7 +111,7 @@ char *argv[];
     char *dbname = 0;
     char defrealm[BUFSIZ];
     int keytypedone = 0;
-    krb5_enctype etype = -1;
+    krb5_enctype etype = 0xffff;
     int sci_idx, code;
     extern krb5_kt_ops krb5_ktf_writable_ops;
     char       *request = NULL;
@@ -170,7 +170,7 @@ char *argv[];
        exit(1);
     }
 
-    if (etype == -1)
+    if (etype == 0xffff)
        etype = krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype;
 
     if (!valid_etype(etype)) {

diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c
index b719889b3720d67555ad33967510a3d3bab71f54..acf100afccad0f556f203f99c76b764bc9dfa638 100644 (file)
--- a/src/admin/stash/kdb5_stash.c
+++ b/src/admin/stash/kdb5_stash.c
@@ -61,7 +61,7 @@ char *argv[];
     char *keyfile = 0;
 
     int keytypedone = 0;
-    krb5_enctype etype = -1;
+    krb5_enctype etype = 0xffff;
 
     if (strrchr(argv[0], '/'))
        argv[0] = strrchr(argv[0], '/')+1;
@@ -107,7 +107,7 @@ char *argv[];
        exit(1);
     }
 
-    if (etype == -1)
+    if (etype == 0xffff)
        etype = krb5_keytype_array[master_keyblock.keytype]->system->proto_enctype;
 
     if (!valid_etype(etype)) {