pullup from trunk To generate a diff of this commit: cvs diff -r1.65 -r1.65.2.1 krb5/src/appl/gss-sample/ChangeLog cvs diff -r1.23 -r1.23.2.1 krb5/src/appl/gss-sample/gss-misc.c cvs diff -r1.30 -r1.30.2.1 krb5/src/appl/gss-sample/gss-server.c