pullup from trunk To generate a diff of this commit: cvs diff -r1.101.2.2 -r1.101.2.3 krb5/src/appl/gssftp/ftpd/ChangeLog cvs diff -r1.67.2.2 -r1.67.2.3 krb5/src/appl/gssftp/ftpd/ftpd.c