summaryrefslogtreecommitdiff
path: root/lib/common/UnixUser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/common/UnixUser.cpp')
-rw-r--r--lib/common/UnixUser.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/common/UnixUser.cpp b/lib/common/UnixUser.cpp
index 32acacfa..7e69b10a 100644
--- a/lib/common/UnixUser.cpp
+++ b/lib/common/UnixUser.cpp
@@ -31,13 +31,21 @@
// Created: 21/1/04
//
// --------------------------------------------------------------------------
+<<<<<<< HEAD
+UnixUser::UnixUser(const char *Username)
+=======
UnixUser::UnixUser(const std::string& Username)
+>>>>>>> 0.12
: mUID(0),
mGID(0),
mRevertOnDestruction(false)
{
// Get password info
+<<<<<<< HEAD
+ struct passwd *pwd = ::getpwnam(Username);
+=======
struct passwd *pwd = ::getpwnam(Username.c_str());
+>>>>>>> 0.12
if(pwd == 0)
{
THROW_EXCEPTION(CommonException, CouldNotLookUpUsername)