CVS commit: src/libexec/ftpd

[Luke Mewburn <lukem%netbsd.org@localhost>]

Module Name:    src
Committed By:   lukem
Date:           Thu Mar 27 08:12:09 UTC 2008

Modified Files:
        src/libexec/ftpd: Makefile ftpd.c version.h

Log Message:
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.57 -r1.58 src/libexec/ftpd/Makefile
cvs rdiff -r1.182 -r1.183 src/libexec/ftpd/ftpd.c
cvs rdiff -r1.65 -r1.66 src/libexec/ftpd/version.h

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