diff options
| -rw-r--r-- | login-utils/last.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/login-utils/last.c b/login-utils/last.c index f7a2576f4..fb82f31c0 100644 --- a/login-utils/last.c +++ b/login-utils/last.c @@ -582,8 +582,6 @@ static int is_phantom(const struct last_control *ctl, struct utmp *ut) { struct passwd *pw; char path[32]; - FILE *f = NULL; - unsigned int loginuid; int ret = 0; if (ut->UL_UT_TIME < ctl->boot_time.tv_sec) @@ -592,14 +590,26 @@ static int is_phantom(const struct last_control *ctl, struct utmp *ut) if (!pw) return 1; sprintf(path, "/proc/%u/loginuid", ut->ut_pid); - if (access(path, R_OK) != 0 || !(f = fopen(path, "r"))) - return 1; + if (access(path, R_OK) == 0) { + unsigned int loginuid; + FILE *f = NULL; + + if (!(f = fopen(path, "r"))) + return 1; + if (fscanf(f, "%u", &loginuid) != 1) + ret = 1; + fclose(f); + if (!ret && pw->pw_uid != loginuid) + return 1; + } else { + struct stat st; - if (fscanf(f, "%u", &loginuid) != 1) - ret = 1; - fclose(f); - if (!ret && pw->pw_uid != loginuid) - return 1; + sprintf(path, "/dev/%s", ut->ut_line); + if (stat(path, &st)) + return 1; + if (pw->pw_uid != st.st_uid) + return 1; + } return ret; } |