Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 518f054b authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

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

am: cc22a8e5

Change-Id: I3dd68cbd2614c6900a0fd4f31c1f6ba2aa128a87
parents 15bdbbc5 cc22a8e5

logd/LogListener.cpp

+5 −5
Original line number Diff line number Diff line
@@ -119,14 +119,14 @@ int LogListener::getLogSocket() { 
    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) {

        if (setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof(on))) {

            return -1;

        }

    }

    return sock;

}

logd/logd.rc

+1 −1
Original line number Diff line number Diff line 
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