pullup from trunk To generate a diff of this commit: cvs diff -r5.56.2.3 -r5.56.2.4 krb5/src/lib/krb5/keytab/ChangeLog cvs diff -r5.25.2.1 -r5.25.2.2 krb5/src/lib/krb5/keytab/ktbase.c