1 files changed, 10 insertions, 5 deletions

diff --git a/src/opentracker.c b/src/opentracker.c
index e467ce6..759a6d0 100644
--- a/src/opentracker.c
+++ b/src/opentracker.c
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <pthread.h>
+#include <grp.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stdint.h>
@@ -300,9 +301,13 @@ void load_state(const char *const state_filename) {
   FILE              *state_filehandle;
   char               inbuf[512];
   ot_hash  infohash;
-  uint64_t age, downcount;
+  uint64_t touched, downcount;
   int      consumed;
 
+  /* The file records the minute a torrent was last touched, by the clock that
+     survives a restart */
+  uint64_t now = (uint64_t)time_wall_minutes();
+
   state_filehandle = fopen(state_filename, "r");
 
   if (state_filehandle == NULL) {
@@ -318,12 +323,12 @@ void load_state(const char *const state_filename) {
       continue;
     i = 2 * sizeof(ot_hash);
 
-    if (inbuf[i++] != ':' || !(consumed = scan_uint(inbuf + i, &age, OT_TORRENT_TIMEOUT)))
+    if (inbuf[i++] != ':' || !(consumed = scan_uint(inbuf + i, &touched, now)))
       continue;
     i += consumed;
     if (inbuf[i++] != ':' || !(consumed = scan_uint(inbuf + i, &downcount, SIZE_MAX)))
       continue;
-    add_torrent_from_saved_state(infohash, (ot_time)age, (size_t)downcount);
+    add_torrent_from_saved_state(infohash, (ot_time)(now - touched), (size_t)downcount);
   }
 
   fclose(state_filehandle);
@@ -356,10 +361,10 @@ int drop_privileges(const char *const serveruser, const char *const serverdir) {
     /* If we can't find server user, revert to nobody's default uid */
     if (!pws) {
       fprintf(stderr, "Warning: Could not get password entry for %s. Reverting to uid -2.\n", serveruser);
-      if (setegid((gid_t)-2) || setgid((gid_t)-2) || setuid((uid_t)-2) || seteuid((uid_t)-2))
+      if (setgroups(0, NULL) || setegid((gid_t)-2) || setgid((gid_t)-2) || setuid((uid_t)-2) || seteuid((uid_t)-2))
         panic("Could not set uid to value -2");
     } else {
-      if (setegid(pws->pw_gid) || setgid(pws->pw_gid) || setuid(pws->pw_uid) || seteuid(pws->pw_uid))
+      if (setgroups(0, NULL) || setegid(pws->pw_gid) || setgid(pws->pw_gid) || setuid(pws->pw_uid) || seteuid(pws->pw_uid))
         panic("Could not set uid to specified value");
     }