X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=65151791cc820dc4f83ab1317e9418a59ac39aa0;hp=326e590b8b8ce7e2d3840024f06dad240f836d5f;hb=93048e5a6f33cc8e2fc547bf65c41551696e23c6;hpb=1fdc2991cbe0c7a03567e69b36632dca6ab8b8ef diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 326e590b8..65151791c 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -371,7 +371,6 @@ bool Drive::unmount () { for (auto i: _mount_points) { - PrivilegeEscalator esc; int const r = umount(i.string().c_str()); LOG_DISK("Tried to unmount %1 and got %2 and %3", i.string(), r, errno); if (r == -1) { @@ -382,41 +381,6 @@ Drive::unmount () } -void -unprivileged () -{ - uid_t ruid, euid, suid; - if (getresuid(&ruid, &euid, &suid) == -1) { - cerr << "getresuid() failed.\n"; - } - if (seteuid(ruid) == -1) { - cerr << "seteuid() failed.\n"; - } -} - - -bool PrivilegeEscalator::test = false; - - -PrivilegeEscalator::~PrivilegeEscalator () -{ - if (!test) { - unprivileged (); - } -} - - -PrivilegeEscalator::PrivilegeEscalator () -{ - if (!test) { - int const r = seteuid(0); - if (r < 0) { - throw PrivilegeError (String::compose("seteuid() call failed with %1", errno)); - } - } -} - - boost::filesystem::path config_path () {