pullup from trunk To generate a diff of this commit: cvs diff -r5.378.2.20 -r5.378.2.21 krb5/src/lib/krb5/krb/ChangeLog cvs diff -r5.29.2.1 -r5.29.2.2 krb5/src/lib/krb5/krb/srv_rcache.c