svn rev #24017: users/lhoward/camellia-ccm/src/lib/krb5/keytab/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24017
Commit By: ghudson
Log Message:
At Luke's request, merge r24016 (fix negative enctype values in
keytabs) from trunk onto his camellia-ccm branch to facilitate
testing.



Changed Files:
U   users/lhoward/camellia-ccm/src/lib/krb5/keytab/kt_file.c
Modified: users/lhoward/camellia-ccm/src/lib/krb5/keytab/kt_file.c
===================================================================
--- users/lhoward/camellia-ccm/src/lib/krb5/keytab/kt_file.c	2010-05-13 17:34:33 UTC (rev 24016)
+++ users/lhoward/camellia-ccm/src/lib/krb5/keytab/kt_file.c	2010-05-13 17:35:40 UTC (rev 24017)
@@ -1362,11 +1362,10 @@
         error = KRB5_KT_END;
         goto fail;
     }
+    if (KTVERSION(id) != KRB5_KT_VNO_1)
+        enctype = ntohs(enctype);
     ret_entry->key.enctype = (krb5_enctype)enctype;
 
-    if (KTVERSION(id) != KRB5_KT_VNO_1)
-        ret_entry->key.enctype = ntohs(ret_entry->key.enctype);
-
     /* key contents */
     ret_entry->key.magic = KV5M_KEYBLOCK;