pullup from trunk To generate a diff of this commit: cvs diff -r1.76.2.1 -r1.76.2.2 krb5/src/lib/kadm5/srv/ChangeLog cvs diff -r1.3 -r1.3.4.1 krb5/src/lib/kadm5/srv/server_kdb.c