commit 504dccec97c12283f348838ba0bf88536322ee6b
author Benoit Goby <benoit@android.com> Tue Jun 12 16:44:11 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 12 16:44:11 2012 -0700
tree 1bc6c1c061163d216f1ae6fc4e7218dbfe062064
parent 1e96e16f81ce46adf5329b1db4662b53b927d4e2
parent aeceb5174502659cb4fff6de924b54ef7e6cdae7

am aeceb517: adb: Fix adb tcpip command

* commit 'aeceb5174502659cb4fff6de924b54ef7e6cdae7':
  adb: Fix adb tcpip command

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index 91db951..cd31b23 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -427,9 +427,9 @@
     D("LS(%d): bound to '%s' via %d\n", s->id, name, fd);
 
 #if !ADB_HOST
-    if ((!strcmp(name, "root:") && getuid() != 0)
-        || !strcmp(name, "usb:")
-        || !strcmp(name, "tcpip:")) {
+    if ((!strncmp(name, "root:", 5) && getuid() != 0)
+        || !strncmp(name, "usb:", 4)
+        || !strncmp(name, "tcpip:", 6)) {
         D("LS(%d): enabling exit_on_close\n", s->id);
         s->exit_on_close = 1;
     }