diff options
| author | Roshan Pius <rpius@google.com> | 2015-10-30 17:07:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-30 17:07:14 +0000 |
| commit | 50425146ec98a51b13fcb91af8d69556950835b2 (patch) | |
| tree | f3edaa1f15043ed10374e5e251d53c24f3cdcc30 | |
| parent | 887494b23fd682256135c074e0c5b85f8b8ed8e6 (diff) | |
| parent | a7ca662bcb928e9e921b0d3fc4c862a2a91c3183 (diff) | |
| download | android_external_dnsmasq-50425146ec98a51b13fcb91af8d69556950835b2.tar.gz android_external_dnsmasq-50425146ec98a51b13fcb91af8d69556950835b2.tar.bz2 android_external_dnsmasq-50425146ec98a51b13fcb91af8d69556950835b2.zip | |
Merge "dnsmasq: Disable DNS server updation via STDIN on Brillo."
am: a7ca662bcb
* commit 'a7ca662bcb928e9e921b0d3fc4c862a2a91c3183':
dnsmasq: Disable DNS server updation via STDIN on Brillo.
| -rwxr-xr-x | src/dnsmasq.c | 12 | ||||
| -rwxr-xr-x | src/dnsmasq.h | 2 | ||||
| -rwxr-xr-x | src/network.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/dnsmasq.c b/src/dnsmasq.c index 2f0fbb6..52d222e 100755 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c @@ -64,7 +64,7 @@ static void sig_handler(int sig); static void async_event(int pipe, time_t now); static void fatal_event(struct event_desc *ev); static void poll_resolv(void); -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(__BRILLO__) static int set_android_listeners(fd_set *set, int *maxfdp); static int check_android_listeners(fd_set *set); #endif @@ -282,7 +282,7 @@ int main (int argc, char **argv) if (!(daemon->options & OPT_DEBUG)) { -#ifndef __ANDROID__ +#if !defined(__ANDROID__) || defined(__BRILLO__) int nullfd; #endif @@ -351,7 +351,7 @@ int main (int argc, char **argv) } } -#ifndef __ANDROID__ +#if !defined(__ANDROID__) || defined(__BRILLO__) /* open stdout etc to /dev/null */ nullfd = open("/dev/null", O_RDWR); dup2(nullfd, STDOUT_FILENO); @@ -591,7 +591,7 @@ int main (int argc, char **argv) t.tv_usec = 0; tp = &t; } -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(__BRILLO__) set_android_listeners(&rset, &maxfd); #endif @@ -686,7 +686,7 @@ int main (int argc, char **argv) check_dbus_listeners(&rset, &wset, &eset); #endif -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(__BRILLO__) check_android_listeners(&rset); #endif @@ -981,7 +981,7 @@ void clear_cache_and_reload(time_t now) #endif } -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(__BRILLO__) static int set_android_listeners(fd_set *set, int *maxfdp) { FD_SET(STDIN_FILENO, set); diff --git a/src/dnsmasq.h b/src/dnsmasq.h index 0b9dbd2..9d8c6dc 100755 --- a/src/dnsmasq.h +++ b/src/dnsmasq.h @@ -781,7 +781,7 @@ int local_bind(int fd, union mysockaddr *addr, char *intname, uint32_t mark, int int random_sock(int family); void pre_allocate_sfds(void); int reload_servers(char *fname); -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(__BRILLO__) int set_servers(const char *servers); void set_interfaces(const char *interfaces); #endif diff --git a/src/network.c b/src/network.c index c7431df..9ae9037 100755 --- a/src/network.c +++ b/src/network.c @@ -916,7 +916,7 @@ void check_servers(void) daemon->servers = ret; } -#ifdef __ANDROID__ +#if defined(__ANDROID__) && !defined(__BRILLO__) /* #define __ANDROID_DEBUG__ 1 */ /* * Ingests a new list of interfaces and starts to listen on them, adding only the new |