From f6cbd5bfc97fb701685dc17b0cfcbbbdb0ff1bcd Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 10 Mar 2007 19:26:02 +0000 Subject: Remove #ifdefs, no longer required (refs #3, merges [1418]) --- lib/common/UnixUser.cpp | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/lib/common/UnixUser.cpp b/lib/common/UnixUser.cpp index 1ec9608d..f81b474c 100644 --- a/lib/common/UnixUser.cpp +++ b/lib/common/UnixUser.cpp @@ -78,12 +78,7 @@ UnixUser::~UnixUser() if(mRevertOnDestruction) { // Revert to "real" user and group id of the process - #ifdef WIN32 - if(0) - #else - if(::setegid(::getgid()) != 0 - || ::seteuid(::getuid()) != 0) - #endif + if(::setegid(::getgid()) != 0 || ::seteuid(::getuid()) != 0) { THROW_EXCEPTION(CommonException, CouldNotRestoreProcessUser) } @@ -105,12 +100,7 @@ void UnixUser::ChangeProcessUser(bool Temporary) if(Temporary) { // Change temporarily (change effective only) - #ifdef WIN32 - if(0) - #else - if(::setegid(mGID) != 0 - || ::seteuid(mUID) != 0) - #endif + if(::setegid(mGID) != 0 || ::seteuid(mUID) != 0) { THROW_EXCEPTION(CommonException, CouldNotChangeProcessUser) } @@ -121,12 +111,7 @@ void UnixUser::ChangeProcessUser(bool Temporary) else { // Change permanently (change all UIDs and GIDs) - #ifdef WIN32 - if(0) - #else - if(::setgid(mGID) != 0 - || ::setuid(mUID) != 0) - #endif + if(::setgid(mGID) != 0 || ::setuid(mUID) != 0) { THROW_EXCEPTION(CommonException, CouldNotChangeProcessUser) } -- cgit v1.2.3