commit 29f26a8dc7169b040d5aed28c7e1ee94fb8f6b5a
author The Android Automerger <android-build@android.com> Wed Jun 13 08:49:09 2012 -0700
committer The Android Automerger <android-build@android.com> Wed Jun 13 08:49:09 2012 -0700
tree ebdf729b2d0104e279a3376cfb90759ba4dc85f6
parent aeceb5174502659cb4fff6de924b54ef7e6cdae7
parent 26ef0f99cd4d2907366ac30d58e8b25a18e1762c

merge in jb-release history after reset to jb-dev

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;
     }