commit 59c08dd67b3451249dc5452accda57162c65aa41
author Bernie Innocenti <codewiz@google.com> Sat Sep 08 01:58:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 08 01:58:34 2018 +0000
tree 95b80beb47b8b4c11bd4b7556aa4725e1bc83456
parent 431d2ff1418cf94c36437f35b1f55b81e2e1d976
parent fb4eaa019e9a6eeb576f63cb2eeffe14fb8749ea

Merge "Improve netd detection"

libc/bionic/NetdClient.cpp

diff --git a/libc/bionic/NetdClient.cpp b/libc/bionic/NetdClient.cpp
index 966cbcc..a5c519e 100644
--- a/libc/bionic/NetdClient.cpp
+++ b/libc/bionic/NetdClient.cpp
@@ -39,7 +39,7 @@
 static void netdClientInitImpl() {
     // Prevent netd from looping back fwmarkd connections to itself. It would work, but it's
     // a deadlock hazard and unnecessary overhead for the resolver.
-    if (getuid() == 0 && strcmp(getprogname(), "netd") == 0) {
+    if (getuid() == 0 && strcmp(basename(getprogname()), "netd") == 0) {
         async_safe_format_log(ANDROID_LOG_INFO, "netdClient",
                               "Skipping libnetd_client init since *we* are netd");
         return;