pullup from trunk To generate a diff of this commit: cvs diff -r1.108.4.1 -r1.108.4.2 krb5/src/appl/gssftp/ftpd/ChangeLog cvs diff -r1.26.6.1 -r1.26.6.2 krb5/src/appl/gssftp/ftpd/ftpcmd.y