Merge 1b5da9c7c5 into 53c405a712

1 week ago · eb74c62bc4
parent 53c405a712 1b5da9c7c5
commit eb74c62bc4
1 changed files with 5 additions and 1 deletions
--- a/src/apps/relay/mainrelay.c
+++ b/src/apps/relay/mainrelay.c
@ -2967,7 +2967,6 @@ static void drop_privileges(void) {
 #if defined(WINDOWS)
  // TODO: implement it!!!
 #else
-  setgroups(0, NULL);
  if (procgroupid_set) {
    if (getgid() != procgroupid) {
      if (setgid(procgroupid) != 0) {
@ -2983,6 +2982,11 @@ static void drop_privileges(void) {

  if (procuserid_set) {
    if (procuserid != getuid()) {
+      if (setgroups(0, NULL) != 0) {
+        perror("setgroups: Unable drop supplementary groups");
+        exit(-1);
+      }
+
      if (setuid(procuserid) != 0) {
        perror("setuid: Unable to change user privileges");
        exit(-1);