lslogins: use hardcoded paths from pathnames.h

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/include/pathnames.h b/include/pathnames.h
index 1cc4e15e6e4fd488ae066a4150c68388ff2ea594..0d21b980b131e5e5d07c3703786a60809caf999d 100644 (file)
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -38,6 +38,7 @@
 #endif
 #define        _PATH_MOTDFILE          "/etc/motd"
 #define        _PATH_NOLOGIN           "/etc/nologin"
+#define        _PATH_VAR_NOLOGIN       "/var/run/nologin"
 
 #define _PATH_LOGIN            "/bin/login"
 #define _PATH_INITTAB          "/etc/inittab"

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index 0c6a1fcbf43ca1f3660ff0722c7c0a97bbc656f2..0e99529a98f77a0669ba94d5e3a21d6a9cfc5420 100644 (file)
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -688,8 +688,8 @@ static struct lslogins_user *get_user_info(struct lslogins_control *ctl, const c
                        if (strstr(pwd->pw_shell, "nologin"))
                                user->nologin = 1;
                        else if (pwd->pw_uid)
-                               user->nologin = access("/etc/nologin", F_OK) == 0 ||
-                                               access("/var/run/nologin", F_OK) == 0;
+                               user->nologin = access(_PATH_NOLOGIN, F_OK) == 0 ||
+                                               access(_PATH_VAR_NOLOGIN, F_OK) == 0;
                        break;
                case COL_PWD_WARN:
                        if (shadow && shadow->sp_warn >= 0)