From 21e70bc7cdea63cac8c81bb58292c90362c7787b Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 7 Apr 2020 16:01:40 +0200
Subject: [PATCH] Rename FS ID setting function

---
 core-writer/include/WriterUtils.hpp    |  2 +-
 core-writer/src/writer/WriterUtils.cpp | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core-writer/include/WriterUtils.hpp b/core-writer/include/WriterUtils.hpp
index 266518f..6eec775 100644
--- a/core-writer/include/WriterUtils.hpp
+++ b/core-writer/include/WriterUtils.hpp
@@ -4,7 +4,7 @@
 #include <string>
 
 namespace WriterUtils {
-    void set_process_effective_id(int user_id);
+    void set_fs_id(int user_id);
     void create_destination_folder(const std::string& output_file);
 }
 
diff --git a/core-writer/src/writer/WriterUtils.cpp b/core-writer/src/writer/WriterUtils.cpp
index 0bf15cc..5092068 100644
--- a/core-writer/src/writer/WriterUtils.cpp
+++ b/core-writer/src/writer/WriterUtils.cpp
@@ -1,12 +1,11 @@
 #include <iostream>
-#include <unistd.h>
-
+#include <sys/fsuid.h>
 #include "WriterUtils.hpp"
 #include "date.h"
 
 using namespace std;
 
-void WriterUtils::set_process_effective_id(int user_id)
+void WriterUtils::set_fs_id(int user_id)
 {
 
     #ifdef DEBUG_OUTPUT
@@ -17,25 +16,25 @@ void WriterUtils::set_process_effective_id(int user_id)
         cout << " Setting process user to " << user_id << endl;
     #endif
 
-    if (setegid(user_id)) {
+    if (setfsgid(user_id)) {
         stringstream err_msg;
 
         using namespace date;
         using namespace chrono;
         err_msg << "[" << system_clock::now() << "]";
-        err_msg << "[WriterUtils::set_process_effective_id]";
+        err_msg << "[WriterUtils::set_fs_uid]";
         err_msg << " Cannot set group_id to " << user_id << endl;
 
         throw runtime_error(err_msg.str());
     }
 
-    if (seteuid(user_id)) {
+    if (setfsuid(user_id)) {
         stringstream err_msg;
 
         using namespace date;
         using namespace chrono;
         err_msg << "[" << system_clock::now() << "]";
-        err_msg << "[WriterUtils::set_process_effective_id]";
+        err_msg << "[WriterUtils::set_fs_uid]";
         err_msg << " Cannot set user_id to " << user_id << endl;
 
         throw runtime_error(err_msg.str());