merge in jb-release history after reset to master
diff --git a/etc/init.rc b/etc/init.rc
index 89a161e..c001a96 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -15,9 +15,6 @@
mkdir /cache
mount /tmp /tmp tmpfs
- chown root shell /tmp
- chmod 0775 /tmp
-
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 18D1
write /sys/class/android_usb/android0/idProduct D001
diff --git a/minadbd/README.txt b/minadbd/README.txt
index 1413fe2..0c190d0 100644
--- a/minadbd/README.txt
+++ b/minadbd/README.txt
@@ -4,7 +4,7 @@
adb.c
- much support for host mode and non-linux OS's stripped out; this
version only runs as adbd on the device.
- - always setuid/setgid's itself to the shell user
+ - does not setuid/setgid itself (always stays root)
- only uses USB transport
- references to JDWP removed
- main() removed
@@ -25,7 +25,3 @@
Android.mk
- only builds in adbd mode; builds as static library instead of a
standalone executable.
-
-sysdeps.h
- - changes adb_creat() to use O_NOFOLLOW
-
diff --git a/minadbd/adb.c b/minadbd/adb.c
index 3052458..d1e97b3 100644
--- a/minadbd/adb.c
+++ b/minadbd/adb.c
@@ -858,16 +858,6 @@
usb_init();
}
- if (setgid(AID_SHELL) != 0) {
- fprintf(stderr, "failed to setgid to shell\n");
- exit(1);
- }
- if (setuid(AID_SHELL) != 0) {
- fprintf(stderr, "failed to setuid to shell\n");
- exit(1);
- }
- fprintf(stderr, "userid is %d\n", getuid());
-
D("Event loop starting\n");
fdevent_loop();
diff --git a/minadbd/services.c b/minadbd/services.c
index aef37f7..8fc8b3c 100644
--- a/minadbd/services.c
+++ b/minadbd/services.c
@@ -53,7 +53,6 @@
fd = adb_creat(ADB_SIDELOAD_FILENAME, 0644);
if(fd < 0) {
- fprintf(stderr, "failed to create %s\n", ADB_SIDELOAD_FILENAME);
adb_close(s);
return;
}
diff --git a/minadbd/sysdeps.h b/minadbd/sysdeps.h
index 800ddb7..b518076 100644
--- a/minadbd/sysdeps.h
+++ b/minadbd/sysdeps.h
@@ -324,18 +324,6 @@
return open( pathname, options, mode );
}
-static __inline__ int adb_creat(const char* path, int mode)
-{
- int fd = open(path, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, mode);
-
- if ( fd < 0 )
- return -1;
-
- close_on_exec(fd);
- return fd;
-}
-#undef creat
-#define creat ___xxx_creat
static __inline__ int adb_open( const char* pathname, int options )
{
@@ -392,6 +380,19 @@
#undef unlink
#define unlink ___xxx_unlink
+static __inline__ int adb_creat(const char* path, int mode)
+{
+ int fd = creat(path, mode);
+
+ if ( fd < 0 )
+ return -1;
+
+ close_on_exec(fd);
+ return fd;
+}
+#undef creat
+#define creat ___xxx_creat
+
static __inline__ int adb_socket_accept(int serverfd, struct sockaddr* addr, socklen_t *addrlen)
{
int fd;