Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: binary
MIME-Version: 1.0
X-Mailer: MIME-tools 5.411 (Entity 5.404)
From: tlyu@mit.edu
Subject: CVS Commit
X-RT-Original-Encoding: iso-8859-1
Content-Length: 455

	* ftpcmd.y (getline): Merge Athena change to reject MICed
	password.

	* ftpd.M: Document '-E'.

	* ftpd.c (main): Merge Athena's '-E' changes to prohibit
	unencrypted passwords.


To generate a diff of this commit:



	cvs diff -r1.108 -r1.109 krb5/src/appl/gssftp/ftpd/ChangeLog
	cvs diff -r1.26 -r1.27 krb5/src/appl/gssftp/ftpd/ftpcmd.y
	cvs diff -r1.10 -r1.11 krb5/src/appl/gssftp/ftpd/ftpd.M
	cvs diff -r1.73 -r1.74 krb5/src/appl/gssftp/ftpd/ftpd.c