pullup from trunk To generate a diff of this commit: cvs diff -r5.412 -r5.412.2.1 krb5/src/lib/krb5/os/ChangeLog cvs diff -r1.96 -r1.96.2.1 krb5/src/lib/krb5/os/Makefile.in cvs diff -r5.83 -r5.83.2.1 krb5/src/lib/krb5/os/locate_kdc.c cvs diff -r5.8 -r5.8.8.1 krb5/src/lib/krb5/os/t_locate_kdc.c