Cleanup: Get rid of globals ruid/euid

Author: hdiethelm

src/rtapi/uspace_common.h

@@ -116,7 +116,7 @@ int rtapi_shmem_new(int key, int module_id, unsigned long int size)
    */
   /* ensure the segment is owned by user, not root */
   if(geteuid() == 0) {
-    stat.shm_perm.uid = ruid;
+    stat.shm_perm.uid = WithRoot::getRuid();
     res = shmctl(shmem->id, IPC_SET, &stat);
     if(res < 0) perror("shmctl IPC_SET");
   }

src/rtapi/uspace_rtapi_app.cc

@@ -23,7 +23,7 @@
 #include <string.h>
 
 std::atomic_int WithRoot::level;
-uid_t euid, ruid;
+uid_t WithRoot::ruid, WithRoot::euid;
 
 WithRoot::WithRoot() {
     if (!level++) {
@@ -41,6 +41,11 @@ WithRoot::~WithRoot() {
     }
 }
 
+void WithRoot::init(uid_t ruid_ini, uid_t euid_ini){
+    ruid=ruid_ini;
+    euid=euid_ini;
+}
+
 rtapi_task::rtapi_task()
     : magic{}, id{}, owner{}, uses_fp{}, stacksize{}, prio{}, period{}, nextstart{}, pll_correction{},
       pll_correction_limit{}, arg{}, taskcode{}

src/rtapi/uspace_rtapi_app.hh

@@ -46,7 +46,16 @@ void rtapi_timespec_advance(struct timespec &result, const struct timespec &src,
 struct WithRoot {
     WithRoot();
     ~WithRoot();
+    static void init(uid_t ruid_ini, uid_t euid_ini);
+    static uid_t getRuid(){
+        return ruid;
+    }
+    static uid_t getEuid(){
+        return euid;
+    }
+private:
     static std::atomic_int level;
+    static uid_t ruid, euid;
 };
 
 struct rtapi_task {
@@ -113,7 +122,5 @@ template <class T = rtapi_task> T *rtapi_get_task(int task_id) {
 int find_rt_cpu_number();
 void set_namef(const char *fmt, ...);
 
-extern uid_t euid, ruid; //ToDo: Improve
-
 #define WITH_ROOT WithRoot root
 #endif

src/rtapi/uspace_rtapi_main.cc

@@ -502,8 +502,9 @@ int main(int argc, char **argv) {
         }
         fprintf(stderr, "Running with fallback_uid.  getuid()=%d geteuid()=%d\n", getuid(), geteuid());
     }
-    ruid = getuid();
-    euid = geteuid();
+    uid_t ruid = getuid();
+    uid_t euid = geteuid();
+    WithRoot::init(ruid, euid);
     if (setresuid(euid, euid, ruid) != 0) {
         perror("setresuid");
         abort();
@@ -768,7 +769,7 @@ static RtapiApp *makeDllApp(std::string dllName, int policy) {
 
 static RtapiApp *makeApp() {
     RtapiApp *app;
-    if (euid != 0 || harden_rt() < 0) {
+    if (WithRoot::getEuid() != 0 || harden_rt() < 0) {
         app = makeDllApp("libuspace-posix.so.0", SCHED_OTHER);
     } else {
         WithRoot r;