From 48704798ea79a4cf0a4024ffcd18fc11ca03a43c Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Mon, 19 Mar 2012 15:52:03 -0700 Subject: run minadbd as shell user, remove unused code Make minadbd drop its root privileges after initializing. We need to make the /tmp directory writable by the shell group so that it can drop the sideloaded file there. --- minadbd/sysdeps.h | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'minadbd/sysdeps.h') diff --git a/minadbd/sysdeps.h b/minadbd/sysdeps.h index b51807615..800ddb753 100644 --- a/minadbd/sysdeps.h +++ b/minadbd/sysdeps.h @@ -324,6 +324,18 @@ static __inline__ int adb_open_mode( const char* pathname, int options, int 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 ) { @@ -380,19 +392,6 @@ static __inline__ int adb_unlink(const char* path) #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; -- cgit v1.2.3