1) Use OPIE response only when OPIE keys really used

2) Use commonly used OPIE response form instead of self-made one
This commit is contained in:
Andrey A. Chernov 2001-09-29 19:22:24 +00:00
parent d9730b8b53
commit 896bddb546
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=84146

View File

@ -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