commit 572b41eb503fd765b5a195abd799043989363791
author Simon Kelley <simon@thekelleys.org.uk> Fri Feb 18 18:11:18 2011 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Thu Jan 05 17:31:15 2012 +0000
tree fbeaa561c35e5a80bf1e3994cce2bcfc99455fe6
parent 28866e9567f1ef1cb12d19e78e0e5d5a0335c059

import of dnsmasq-2.57.tar.gz

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 689a86b..827b0dc 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -51,8 +51,11 @@
 #ifndef HAVE_TFTP
 "no-"
 #endif
-"TFTP";
-
+"TFTP "
+#if !defined(LOCALEDIR) && !defined(HAVE_IDN)
+"no-"
+#endif 
+"IDN";
 
 
 static volatile pid_t pid = 0;
@@ -150,6 +153,11 @@
     die(_("asychronous logging is not available under Solaris"), NULL, EC_BADCONF);
 #endif
   
+#ifdef __ANDROID__
+  if (daemon->max_logs != 0)
+    die(_("asychronous logging is not available under Android"), NULL, EC_BADCONF);
+#endif
+
   rand_init();
   
   now = dnsmasq_time();
@@ -384,7 +392,7 @@
 	    (1 << CAP_NET_ADMIN) | (1 << CAP_NET_RAW) | (1 << CAP_SETUID);
 	  
 	  /* Tell kernel to not clear capabilities when dropping root */
-	  if (capset(hdr, data) == -1 || prctl(PR_SET_KEEPCAPS, 1) == -1)
+	  if (capset(hdr, data) == -1 || prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) == -1)
 	    bad_capabilities = errno;
 			  
 #elif defined(HAVE_SOLARIS_NETWORK)
@@ -440,7 +448,7 @@
   
 #ifdef HAVE_LINUX_NETWORK
   if (option_bool(OPT_DEBUG)) 
-    prctl(PR_SET_DUMPABLE, 1);
+    prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
 #endif
 
   if (daemon->port == 0)