pull up from trunk To generate a diff of this commit: cvs diff -r1.46.2.1.2.4 -r1.46.2.1.2.5 krb5/src/lib/kadm5/srv/ChangeLog cvs diff -r1.19.4.2 -r1.19.4.3 krb5/src/lib/kadm5/srv/svr_principal.c