commit a7ca662bcb928e9e921b0d3fc4c862a2a91c3183
author Roshan Pius <rpius@google.com> Fri Oct 30 16:55:34 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 30 16:55:34 2015 +0000
tree 44fc7ddae73c3a5bbb343d69fa9486e7ae207f76
parent b955ca6befab20bc858dcaa6dc1f7f081725f2ac
parent b265d6f2a9a7e2aad83bb0845aab56474d09a3cf

Merge "dnsmasq: Disable DNS server updation via STDIN on Brillo."

src/dnsmasq.c

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 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 @@
   
   if (!(daemon->options & OPT_DEBUG))   
     {
-#ifndef __ANDROID__
+#if !defined(__ANDROID__) || defined(__BRILLO__)
       int nullfd;
 #endif
 
@@ -351,7 +351,7 @@
 	    }
 	}
 
-#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 @@
 	  t.tv_usec = 0;
 	  tp = &t;
 	}
-#ifdef __ANDROID__
+#if defined(__ANDROID__) && !defined(__BRILLO__)
       set_android_listeners(&rset, &maxfd);
 #endif
 
@@ -686,7 +686,7 @@
       check_dbus_listeners(&rset, &wset, &eset);
 #endif
 
-#ifdef __ANDROID__
+#if defined(__ANDROID__) && !defined(__BRILLO__)
       check_android_listeners(&rset);
 #endif
       
@@ -981,7 +981,7 @@
 #endif
 }
 
-#ifdef __ANDROID__
+#if defined(__ANDROID__) && !defined(__BRILLO__)
 
 static int set_android_listeners(fd_set *set, int *maxfdp) {
     FD_SET(STDIN_FILENO, set);

src/dnsmasq.h

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

src/network.c

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 @@
   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