diff options
| author | ache <ache@FreeBSD.org> | 2001-09-29 19:22:24 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2001-09-29 19:22:24 +0000 |
| commit | 7ec889372d0e5b4a87c80ff2e066f5c6419b2b28 (patch) | |
| tree | a22ec16b5704d5227d4345354d6d84090c8d3a9c /libexec | |
| parent | 6689cad44720247770c3439271c41126ceb5476e (diff) | |
| download | FreeBSD-src-7ec889372d0e5b4a87c80ff2e066f5c6419b2b28.zip FreeBSD-src-7ec889372d0e5b4a87c80ff2e066f5c6419b2b28.tar.gz | |
1) Use OPIE response only when OPIE keys really used
2) Use commonly used OPIE response form instead of self-made one
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index e4aa5ed..c2fff41 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -972,8 +972,11 @@ user(name) strncpy(curname, name, sizeof(curname)-1); #ifdef USE_PAM /* XXX Kluge! The conversation mechanism needs to be fixed. */ - opiechallenge(&opiedata, name, opieprompt); - reply(331, "[ %s ] Password required for %s.", opieprompt, name); + if (opiechallenge(&opiedata, name, opieprompt) == 0) + reply(331, "Response to %s required for %s.", + opieprompt, name); + else + reply(331, "Password required for %s.", name); #else reply(331, "Password required for %s.", name); #endif |
