pullup from trunk To generate a diff of this commit: cvs diff -r5.70.4.1 -r5.70.4.2 krb5/src/lib/krb5/keytab/ChangeLog cvs diff -r5.10.4.1 -r5.10.4.2 krb5/src/lib/krb5/keytab/kt_file.c