Convert to auth_level
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1077 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -53,7 +53,7 @@ pop_pass (POP *p)
|
|||||||
krb_set_tkt_string (tkt);
|
krb_set_tkt_string (tkt);
|
||||||
if (otp_verify_user (&p->otp_ctx, p->pop_parm[1]) == 0)
|
if (otp_verify_user (&p->otp_ctx, p->pop_parm[1]) == 0)
|
||||||
;
|
;
|
||||||
else if(p->no_passwd)
|
else if(p->auth_level != AUTH_NONE)
|
||||||
return pop_msg(p, POP_FAILURE,
|
return pop_msg(p, POP_FAILURE,
|
||||||
"Password supplied for \"%s\" is incorrect.",
|
"Password supplied for \"%s\" is incorrect.",
|
||||||
p->user);
|
p->user);
|
||||||
|
@@ -21,7 +21,7 @@ pop_user (POP *p)
|
|||||||
if (otp_challenge (&p->otp_ctx, p->user, ss, sizeof(ss)) == 0) {
|
if (otp_challenge (&p->otp_ctx, p->user, ss, sizeof(ss)) == 0) {
|
||||||
return pop_msg(p, POP_SUCCESS, "Password %s required for %s.",
|
return pop_msg(p, POP_SUCCESS, "Password %s required for %s.",
|
||||||
ss, p->user);
|
ss, p->user);
|
||||||
} else if (p->no_passwd) {
|
} else if (p->auth_level != AUTH_NONE) {
|
||||||
char *s = otp_error(&p->otp_ctx);
|
char *s = otp_error(&p->otp_ctx);
|
||||||
return pop_msg(p, POP_FAILURE, "Permission denied%s%s",
|
return pop_msg(p, POP_FAILURE, "Permission denied%s%s",
|
||||||
s ? ":" : "", s);
|
s ? ":" : "", s);
|
||||||
|
Reference in New Issue
Block a user