commit cc22a8e5a25e63fa61e1236ef4df28bfea05be35
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 09 00:59:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 09 00:59:07 2017 +0000
tree f12cded28a17b94a6760b8ca90f5fb39b10e8534
parent 84606f8686cf486b19644e2ac167dd2a6868805b
parent 54d8ff1121440d0ef4565ce0ab3751f82fdb393c

Merge "logd: add "+passcred" for logdw socket"

logd/LogListener.cpp

diff --git a/logd/LogListener.cpp b/logd/LogListener.cpp
index 709646e..3c0d08d 100644
--- a/logd/LogListener.cpp
+++ b/logd/LogListener.cpp
@@ -119,14 +119,14 @@
     static const char socketName[] = "logdw";
     int sock = android_get_control_socket(socketName);
 
-    if (sock < 0) {
+    if (sock < 0) {  // logd started up in init.sh
         sock = socket_local_server(
             socketName, ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_DGRAM);
-    }
 
-    int on = 1;
-    if (setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on)) < 0) {
-        return -1;
+        int on = 1;
+        if (setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on))) {
+            return -1;
+        }
     }
     return sock;
 }

logd/logd.rc

diff --git a/logd/logd.rc b/logd/logd.rc
index 7494d8f..8804246 100644
--- a/logd/logd.rc
+++ b/logd/logd.rc
@@ -1,7 +1,7 @@
 service logd /system/bin/logd
     socket logd stream 0666 logd logd
     socket logdr seqpacket 0666 logd logd
-    socket logdw dgram 0222 logd logd
+    socket logdw dgram+passcred 0222 logd logd
     file /proc/kmsg r
     file /dev/kmsg w
     user logd