pullup from trunk To generate a diff of this commit: cvs diff -r1.80.2.1 -r1.80.2.2 krb5/src/kadmin/cli/ChangeLog cvs diff -r1.57.2.1 -r1.57.2.2 krb5/src/kadmin/cli/kadmin.c