1 files changed, 6 insertions, 4 deletions

diff --git a/server.c b/server.c
index ed551694..1113d4dc 100644
--- a/server.c
+++ b/server.c
@@ -565,12 +565,13 @@ server_lock_server(void)
 			continue;
 
 		if (s->flags & SESSION_UNATTACHED) {
-			s->activity = time(NULL);
+			if (gettimeofday(&s->activity_time, NULL) != 0)
+				fatal("gettimeofday failed");
 			continue;
 		}
 
 		timeout = options_get_number(&s->options, "lock-after-time");
-		if (timeout <= 0 || t <= s->activity + timeout)
+		if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout)
 			return;	/* not timed out */
 	}
 
@@ -593,12 +594,13 @@ server_lock_sessions(void)
 			continue;
 
 		if (s->flags & SESSION_UNATTACHED) {
-			s->activity = time(NULL);
+			if (gettimeofday(&s->activity_time, NULL) != 0)
+				fatal("gettimeofday failed");
 			continue;
 		}
 
 		timeout = options_get_number(&s->options, "lock-after-time");
-		if (timeout > 0 && t > s->activity + timeout) {
+		if (timeout > 0 && t > s->activity_time.tv_sec + timeout) {
 			server_lock_session(s);
 			recalculate_sizes();
 		}