pullup from trunk To generate a diff of this commit: cvs diff -r5.251.2.14 -r5.251.2.15 krb5/src/kdc/ChangeLog cvs diff -r5.115.2.3 -r5.115.2.4 krb5/src/kdc/main.c