CVS commit: [netbsd-4-0] src/libexec/ftpd

[Manuel Bouyer <bouyer%netbsd.org@localhost>]

Module Name:    src
Committed By:   bouyer
Date:           Thu Sep 18 18:17:00 UTC 2008

Modified Files:
        src/libexec/ftpd [netbsd-4-0]: Makefile ftpd.c version.h

Log Message:
Pull up following revision(s) (requested by lukem in ticket #1201):
        libexec/ftpd/ftpd.c: revision 1.183
        libexec/ftpd/Makefile: revision 1.58
        libexec/ftpd/version.h: revision 1.66
Reorganize USE_PAM support so that the reply(331,) from USER is
performed by the pam_conv (PAM conversation) callback, which then
getline()s the PASS reply internally.  This involves calling
auth_pam() from user() and caching the result to use later in pass().
This allows the PAM modules to present a different password prompt
dialog if necesary.  For example:
  Name (localhost:lukem):
  331 User lukem accepted, provide password [ otp-md4 89 xxxx12345 ].
versus
  Name (localhost:lukem): root
  331 User root accepted, provide password.
This is independent of (and effectively exclusive to) USE_SKEY support.
Previously ftpd with USE_SKEY=yes would provide the skey prompt
if the user had an skey configured, even if /etc/pam.d/ftpd didn't
have pam_skey in use.
I.e., ftpd shouldn't need special support for custom password prompts
(such as skey) if PAM is in use.


To generate a diff of this commit:
cvs rdiff -r1.56 -r1.56.8.1 src/libexec/ftpd/Makefile
cvs rdiff -r1.177.6.2 -r1.177.6.3 src/libexec/ftpd/ftpd.c
cvs rdiff -r1.65 -r1.65.12.1 src/libexec/ftpd/version.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.