diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /lib/common/UnixUser.cpp | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
Diffstat (limited to 'lib/common/UnixUser.cpp')
| -rw-r--r-- | lib/common/UnixUser.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/common/UnixUser.cpp b/lib/common/UnixUser.cpp index 7e69b10a..32acacfa 100644 --- a/lib/common/UnixUser.cpp +++ b/lib/common/UnixUser.cpp @@ -31,21 +31,13 @@ // 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) |