]> xenbits.xensource.com Git - libvirt.git/commitdiff
rpc: fix getsockopt for LOCAL_PEERCRED on Mac OS X
authorRyota Ozaki <ozaki.ryota@gmail.com>
Sat, 5 Oct 2013 05:56:36 +0000 (14:56 +0900)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 7 Oct 2013 08:18:55 +0000 (10:18 +0200)
This fixes the following error:
  error : virGetUserEnt:703 : Failed to find user record for uid '32654'

'32654' (it's random and varies) comes from getsockopt with
LOCAL_PEERCRED option. getsockopt returns w/o error but seems
to not set any value to the buffer for uid.

For Mac OS X, LOCAL_PEERCRED has to be used with SOL_LOCAL level.
With SOL_LOCAL, getsockopt returns a correct uid.

Note that SOL_LOCAL can be found in
/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/sys/un.h.

Signed-off-by: Ryota Ozaki <ozaki.ryota@gmail.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/rpc/virnetsocket.c

index 152c5fcdfcd5804e76ff3e29fadc660f61e2b939..a2823efc3a0f9bb871f2276afef745fb5e9ad784 100644 (file)
@@ -1159,7 +1159,11 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
     socklen_t cr_len = sizeof(cr);
     virObjectLock(sock);
 
+# if defined(__APPLE__)
+    if (getsockopt(sock->fd, SOL_LOCAL, LOCAL_PEERCRED, &cr, &cr_len) < 0) {
+# else
     if (getsockopt(sock->fd, SOL_SOCKET, LOCAL_PEERCRED, &cr, &cr_len) < 0) {
+# endif
         virReportSystemError(errno, "%s",
                              _("Failed to get client socket identity"));
         virObjectUnlock(sock);