diff options
author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /lib/common/UnixUser.cpp | |
parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) |
merge upstream version 0.12
Diffstat (limited to 'lib/common/UnixUser.cpp')
-rw-r--r-- | lib/common/UnixUser.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/common/UnixUser.cpp b/lib/common/UnixUser.cpp index f81b474c..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) |