Allow PrivilegeEscalator to be disabled during tests.

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 8b594177e884df269de5395976ed79e135132714..d8f0e56a565ab397092ca6408675fd997890120d 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -73,6 +73,8 @@ class PrivilegeEscalator
 public:
        PrivilegeEscalator ();
        ~PrivilegeEscalator ();
+
+       static bool test;
 };
 
 /** @class Waker

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index b6241ec1a3f38763b76e19b03aad2df74fac187b..262ba59ce4cd5c9650234fef4c575edd97ebdc46 100644 (file)
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -373,16 +373,23 @@ unprivileged ()
        }
 }
 
+
+bool PrivilegeEscalator::test = false;
+
 PrivilegeEscalator::~PrivilegeEscalator ()
 {
-       unprivileged ();
+       if (!test) {
+               unprivileged ();
+       }
 }
 
 PrivilegeEscalator::PrivilegeEscalator ()
 {
-       int const r = seteuid(0);
-       if (r < 0) {
-               throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
+       if (!test) {
+               int const r = seteuid(0);
+               if (r < 0) {
+                       throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
+               }
        }
 }