|
 |
f22e83 |
From 96698a525784ad91cb27b572dd5f871c183fdfa5 Mon Sep 17 00:00:00 2001
|
|
|
f22e83 |
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
|
|
f22e83 |
Date: Sun, 28 Jul 2019 12:25:35 +0200
|
|
|
f22e83 |
Subject: [PATCH 1/2] Set s_uwtmp_inserted only after record insertion/removal
|
|
|
f22e83 |
|
|
|
f22e83 |
pututxline() is the function that actually inserts the new record, so
|
|
|
f22e83 |
setting 's_uwtmp_inserted' before calling pututxline() doesn't make
|
|
|
f22e83 |
sense.
|
|
|
f22e83 |
|
|
|
f22e83 |
We'll need this change for other fixes.
|
|
|
f22e83 |
---
|
|
|
f22e83 |
sysdeputil.c | 4 ++--
|
|
|
f22e83 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
f22e83 |
|
|
|
f22e83 |
diff --git a/sysdeputil.c b/sysdeputil.c
|
|
|
f22e83 |
index 4fe56c2..bd1e8c9 100644
|
|
|
f22e83 |
--- a/sysdeputil.c
|
|
|
f22e83 |
+++ b/sysdeputil.c
|
|
|
f22e83 |
@@ -1224,7 +1224,6 @@ vsf_insert_uwtmp(const struct mystr* p_user_str,
|
|
|
f22e83 |
sizeof(s_utent.ut_line));
|
|
|
f22e83 |
str_free(&line_str);
|
|
|
f22e83 |
}
|
|
|
f22e83 |
- s_uwtmp_inserted = 1;
|
|
|
f22e83 |
s_utent.ut_type = USER_PROCESS;
|
|
|
f22e83 |
s_utent.ut_pid = vsf_sysutil_getpid();
|
|
|
f22e83 |
vsf_sysutil_strcpy(s_utent.ut_user, str_getbuf(p_user_str),
|
|
|
f22e83 |
@@ -1235,6 +1234,7 @@ vsf_insert_uwtmp(const struct mystr* p_user_str,
|
|
|
f22e83 |
setutxent();
|
|
|
f22e83 |
(void) pututxline(&s_utent);
|
|
|
f22e83 |
endutxent();
|
|
|
f22e83 |
+ s_uwtmp_inserted = 1;
|
|
|
f22e83 |
updwtmpx(WTMPX_FILE, &s_utent);
|
|
|
f22e83 |
}
|
|
|
f22e83 |
|
|
|
f22e83 |
@@ -1245,7 +1245,6 @@ vsf_remove_uwtmp(void)
|
|
|
f22e83 |
{
|
|
|
f22e83 |
return;
|
|
|
f22e83 |
}
|
|
|
f22e83 |
- s_uwtmp_inserted = 0;
|
|
|
f22e83 |
s_utent.ut_type = DEAD_PROCESS;
|
|
|
f22e83 |
vsf_sysutil_memclr(s_utent.ut_user, sizeof(s_utent.ut_user));
|
|
|
f22e83 |
vsf_sysutil_memclr(s_utent.ut_host, sizeof(s_utent.ut_host));
|
|
|
f22e83 |
@@ -1253,6 +1252,7 @@ vsf_remove_uwtmp(void)
|
|
|
f22e83 |
setutxent();
|
|
|
f22e83 |
(void) pututxline(&s_utent);
|
|
|
f22e83 |
endutxent();
|
|
|
f22e83 |
+ s_uwtmp_inserted = 0;
|
|
|
f22e83 |
s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();
|
|
|
f22e83 |
updwtmpx(WTMPX_FILE, &s_utent);
|
|
|
f22e83 |
}
|
|
|
f22e83 |
--
|
|
|
f22e83 |
2.20.1
|
|
|
f22e83 |
|