summaryrefslogtreecommitdiffstats
path: root/x11vnc/user.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11vnc/user.c')
-rw-r--r--x11vnc/user.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/x11vnc/user.c b/x11vnc/user.c
index 5269d50..eafbb2f 100644
--- a/x11vnc/user.c
+++ b/x11vnc/user.c
@@ -5,6 +5,7 @@
#include "cleanup.h"
#include "scan.h"
#include "screen.h"
+#include "unixpw.h"
void check_switched_user(void);
void lurk_loop(char *str);
@@ -44,6 +45,8 @@ void check_switched_user(void) {
int delay = 15;
time_t now = time(0);
+ if (unixpw_in_progress) return;
+
if (started_as_root == 1 && users_list) {
try_to_switch_users();
if (started_as_root == 2) {
@@ -923,6 +926,8 @@ void check_new_passwds(void) {
if (strstr(passwdfile, "read:") != passwdfile) {
return;
}
+ if (unixpw_in_progress) return;
+
now = time(0);
if (now > last_check + 1) {
if (read_passwds(passwdfile)) {