diff options
| author | Benny Baumann <BenBE@geshi.org> | 2023-11-13 14:17:01 +0100 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2023-11-14 00:27:49 +0100 |
| commit | a51c2cc8cb11c340e3768d6142008862b7ce69c1 (patch) | |
| tree | 6c405ab1d56798e45e3b839d2954bb192db3e0ac /modules/pam_unix/pam_unix_passwd.c | |
| parent | 320fd5f60f43709209f2fbe2aa31b81af58389b8 (diff) | |
| download | pam-a51c2cc8cb11c340e3768d6142008862b7ce69c1.tar.gz pam-a51c2cc8cb11c340e3768d6142008862b7ce69c1.tar.bz2 pam-a51c2cc8cb11c340e3768d6142008862b7ce69c1.zip | |
pam_unix: only output length check message on failure
The debug message was placed outside the password length check and thus
if the length check succeeded no message would have been placed.
Comparing this location with other occurrences indicates this was by mistake,
thus the message is now suppressed if there's nothing to print anyway.
Signed-off-by: Benny Baumann <BenBE@geshi.org>
Diffstat (limited to 'modules/pam_unix/pam_unix_passwd.c')
| -rw-r--r-- | modules/pam_unix/pam_unix_passwd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index c3417413..c1d547c7 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -572,9 +572,10 @@ static int _pam_unix_approve_pass(pam_handle_t * pamh remark = _("You must choose a shorter password."); D(("length exceeded [%s]", remark)); } else if (off(UNIX__IAMROOT, ctrl)) { - if ((int)strlen(pass_new) < pass_min_len) + if ((int)strlen(pass_new) < pass_min_len) { remark = _("You must choose a longer password."); - D(("length check [%s]", remark)); + D(("length check [%s]", remark)); + } if (on(UNIX_REMEMBER_PASSWD, ctrl)) { if ((retval = check_old_password(user, pass_new)) == PAM_AUTHTOK_ERR) remark = _("Password has been already used. Choose another."); |