66/376: nix-daemon: Show name of connecting user

[Ludovic Courtès]

civodul pushed a commit to tag 1.8
in repository guix.

commit 0c730887c4ec4a03fb854490e422c134a1bf8139
Author: Eelco Dolstra <address@hidden>
Date:   Thu Jul 17 15:49:33 2014 +0200

    nix-daemon: Show name of connecting user
---
 src/nix-daemon/nix-daemon.cc |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index f486806..fd030fe 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -17,6 +17,7 @@
 #include <sys/un.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <pwd.h>
 
 using namespace nix;
 
@@ -855,23 +856,23 @@ static void daemonLoop()
             closeOnExec(remote);
 
             bool trusted = false;
-
             pid_t clientPid = -1;
 
 #if defined(SO_PEERCRED)
             /* Get the identity of the caller, if possible. */
-            uid_t clientUid = -1;
-
             ucred cred;
             socklen_t credLen = sizeof(cred);
             if (getsockopt(remote, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) 
== -1)
                 throw SysError("getting peer credentials");
 
             clientPid = cred.pid;
-            clientUid = cred.uid;
-            if (clientUid == 0) trusted = true;
 
-            printMsg(lvlInfo, format("accepted connection from pid %1%, uid 
%2%") % clientPid % clientUid);
+            struct passwd * pw = getpwuid(cred.uid);
+            string user = pw ? pw->pw_name : int2String(cred.uid);
+
+            if (cred.uid == 0) trusted = true;
+
+            printMsg(lvlInfo, format("accepted connection from pid %1%, user 
%2%") % clientPid % user);
 #endif
 
             /* Fork a child to handle the connection. */