From a33d18e125e21820ad01580342a708d62c09973f Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sat, 9 Dec 2017 12:12:13 +0800 Subject: [PATCH] Go back to getpwuid call on OSX Reading /etc/passwd on OSX does not give us the full list of users. Fixes #1758 --- src/remote.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/remote.cc b/src/remote.cc index 8cfbdc5b..0539c026 100644 --- a/src/remote.cc +++ b/src/remote.cc @@ -530,6 +530,9 @@ void RemoteUI::exit(int status) String get_user_name(int uid) { +#if defined(__APPLE__) + return getpwuid(uid)->pw_name; +#else // Do not use getpwuid to avoid dependency on dynamic glibc struct invalid_index : runtime_error { invalid_index(size_t i) : runtime_error{format("invalid index '{}'", i)} {} @@ -543,6 +546,7 @@ String get_user_name(int uid) return name_and_id[0].str(); } throw runtime_error(format("Cannot find user name for uid '{}'", uid)); +#endif } static sockaddr_un session_addr(StringView session)