Module Name:	krb5
Committed By:	tlyu
Date:		Wed Nov  3 22:50:16 UTC 2004

Modified Files:
	 krb5/src/appl/gssftp/ftpd/ChangeLog
		krb5/src/appl/gssftp/ftpd/ftpcmd.y
		krb5/src/appl/gssftp/ftpd/ftpd.M
		krb5/src/appl/gssftp/ftpd/ftpd.c
Added Files:

Removed Files:


Log Message
ticket: new
subject: merge athena ftpd changes for requiring encrypted passwords
target_version: 1.4
tags: pullup

	* 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