summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2012-06-12 16:46:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-12 16:46:48 -0700
commit66086a586f80e394674eb171d683d0d9677e3abf (patch)
tree19d3737a20b37c5092ac90999ccabcc475296ca4
parentd3eb825c4e39f32663154c6e4329968956dd8956 (diff)
parent504dccec97c12283f348838ba0bf88536322ee6b (diff)
downloadsystem_core-66086a586f80e394674eb171d683d0d9677e3abf.zip
system_core-66086a586f80e394674eb171d683d0d9677e3abf.tar.gz
system_core-66086a586f80e394674eb171d683d0d9677e3abf.tar.bz2
am 504dccec: am aeceb517: adb: Fix adb tcpip command
* commit '504dccec97c12283f348838ba0bf88536322ee6b': adb: Fix adb tcpip command
-rw-r--r--adb/sockets.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/sockets.c b/adb/sockets.c
index b77c38c..305cb44 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -427,9 +427,9 @@ asocket *create_local_service_socket(const char *name)
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;
}