|
 |
dbeef3 |
From 53339f53ab71c138578d4102a4e4011344d33b2d Mon Sep 17 00:00:00 2001
|
|
|
dbeef3 |
From: Karel Zak <kzak@redhat.com>
|
|
|
dbeef3 |
Date: Tue, 7 Jun 2022 09:11:56 +0200
|
|
|
dbeef3 |
Subject: lslogins: improve prefixes interpretation
|
|
|
dbeef3 |
|
|
|
dbeef3 |
It seems that for example 'passwd --lock' uses two exclamation marks
|
|
|
dbeef3 |
in password field. It seems better to assume arbitrary number of '!'
|
|
|
dbeef3 |
and '*' prefixes.
|
|
|
dbeef3 |
|
|
|
dbeef3 |
The patch also makes description of the PWD-EMPTY output field more
|
|
|
dbeef3 |
explicit.
|
|
|
dbeef3 |
|
|
|
dbeef3 |
Upstream: http://github.com/util-linux/util-linux/commit/c51cba1e838ae7e36a843ec785543492bb8737cd
|
|
|
dbeef3 |
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2094216
|
|
|
dbeef3 |
Signed-off-by: Karel Zak <kzak@redhat.com>
|
|
|
dbeef3 |
---
|
|
|
dbeef3 |
login-utils/lslogins.c | 33 ++++++++++++++++++++++++++-------
|
|
|
dbeef3 |
1 file changed, 26 insertions(+), 7 deletions(-)
|
|
|
dbeef3 |
|
|
|
dbeef3 |
diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
|
|
|
dbeef3 |
index c37df9096..1332a9925 100644
|
|
|
dbeef3 |
--- a/login-utils/lslogins.c
|
|
|
dbeef3 |
+++ b/login-utils/lslogins.c
|
|
|
dbeef3 |
@@ -225,7 +225,7 @@ static const struct lslogins_coldesc coldescs[] =
|
|
|
dbeef3 |
{
|
|
|
dbeef3 |
[COL_USER] = { "USER", N_("user name"), N_("Username"), 0.1, SCOLS_FL_NOEXTREMES },
|
|
|
dbeef3 |
[COL_UID] = { "UID", N_("user ID"), "UID", 1, SCOLS_FL_RIGHT},
|
|
|
dbeef3 |
- [COL_PWDEMPTY] = { "PWD-EMPTY", N_("password not required"), N_("Password not required"), 1, SCOLS_FL_RIGHT },
|
|
|
dbeef3 |
+ [COL_PWDEMPTY] = { "PWD-EMPTY", N_("password not defined"), N_("Password not required (empty)"), 1, SCOLS_FL_RIGHT },
|
|
|
dbeef3 |
[COL_PWDDENY] = { "PWD-DENY", N_("login by password disabled"), N_("Login by password disabled"), 1, SCOLS_FL_RIGHT },
|
|
|
dbeef3 |
[COL_PWDLOCK] = { "PWD-LOCK", N_("password defined, but locked"), N_("Password is locked"), 1, SCOLS_FL_RIGHT },
|
|
|
dbeef3 |
[COL_PWDMETHOD] = { "PWD-METHOD", N_("password encryption method"), N_("Password encryption method"), 0.1 },
|
|
|
dbeef3 |
@@ -817,23 +817,42 @@ static struct lslogins_user *get_user_info(struct lslogins_control *ctl, const c
|
|
|
dbeef3 |
break;
|
|
|
dbeef3 |
case COL_PWDEMPTY:
|
|
|
dbeef3 |
if (shadow) {
|
|
|
dbeef3 |
- if (!*shadow->sp_pwdp) /* '\0' */
|
|
|
dbeef3 |
+ const char *p = shadow->sp_pwdp;
|
|
|
dbeef3 |
+
|
|
|
dbeef3 |
+ while (p && (*p == '!' || *p == '*'))
|
|
|
dbeef3 |
+ p++;
|
|
|
dbeef3 |
+
|
|
|
dbeef3 |
+ if (!p || !*p)
|
|
|
dbeef3 |
user->pwd_empty = STATUS_TRUE;
|
|
|
dbeef3 |
} else
|
|
|
dbeef3 |
user->pwd_empty = STATUS_UNKNOWN;
|
|
|
dbeef3 |
break;
|
|
|
dbeef3 |
case COL_PWDDENY:
|
|
|
dbeef3 |
if (shadow) {
|
|
|
dbeef3 |
- if ((*shadow->sp_pwdp == '!' ||
|
|
|
dbeef3 |
- *shadow->sp_pwdp == '*') &&
|
|
|
dbeef3 |
- !valid_pwd(shadow->sp_pwdp + 1))
|
|
|
dbeef3 |
+ const char *p = shadow->sp_pwdp;
|
|
|
dbeef3 |
+
|
|
|
dbeef3 |
+ while (p && (*p == '!' || *p == '*'))
|
|
|
dbeef3 |
+ p++;
|
|
|
dbeef3 |
+
|
|
|
dbeef3 |
+ if (p && *p && p != shadow->sp_pwdp && !valid_pwd(p))
|
|
|
dbeef3 |
user->pwd_deny = STATUS_TRUE;
|
|
|
dbeef3 |
} else
|
|
|
dbeef3 |
user->pwd_deny = STATUS_UNKNOWN;
|
|
|
dbeef3 |
break;
|
|
|
dbeef3 |
case COL_PWDLOCK:
|
|
|
dbeef3 |
if (shadow) {
|
|
|
dbeef3 |
- if (*shadow->sp_pwdp == '!' && valid_pwd(shadow->sp_pwdp + 1))
|
|
|
dbeef3 |
+ const char *p = shadow->sp_pwdp;
|
|
|
dbeef3 |
+ int i = 0;
|
|
|
dbeef3 |
+
|
|
|
dbeef3 |
+ /* 'passwd --lock' uses two exclamation marks,
|
|
|
dbeef3 |
+ * shadow(5) describes the lock as "field which
|
|
|
dbeef3 |
+ * starts with an exclamation mark". Let's
|
|
|
dbeef3 |
+ * support more '!' ...
|
|
|
dbeef3 |
+ */
|
|
|
dbeef3 |
+ while (p && *p == '!')
|
|
|
dbeef3 |
+ p++, i++;
|
|
|
dbeef3 |
+
|
|
|
dbeef3 |
+ if (i != 0 && (!*p || valid_pwd(p)))
|
|
|
dbeef3 |
user->pwd_lock = STATUS_TRUE;
|
|
|
dbeef3 |
} else
|
|
|
dbeef3 |
user->pwd_lock = STATUS_UNKNOWN;
|
|
|
dbeef3 |
@@ -842,7 +861,7 @@ static struct lslogins_user *get_user_info(struct lslogins_control *ctl, const c
|
|
|
dbeef3 |
if (shadow) {
|
|
|
dbeef3 |
const char *p = shadow->sp_pwdp;
|
|
|
dbeef3 |
|
|
|
dbeef3 |
- if (*p == '!' || *p == '*')
|
|
|
dbeef3 |
+ while (p && (*p == '!' || *p == '*'))
|
|
|
dbeef3 |
p++;
|
|
|
dbeef3 |
user->pwd_method = get_pwd_method(p, NULL, NULL);
|
|
|
dbeef3 |
} else
|
|
|
dbeef3 |
--
|
|
|
dbeef3 |
2.36.1
|
|
|
dbeef3 |
|