Merge tag 'android-4.3_r2.1' into cm-10.2cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2

Android 4.3 release 2.1

4 files changed, 16 insertions, 4 deletions

diff --git a/Android.mk b/Android.mk
index 55e5f68..b09dc2a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,7 +14,6 @@ LOCAL_SRC_FILES := arp.c bind.c common.c control.c dhcp.c dhcpcd.c duid.c \
 #LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
 LOCAL_SHARED_LIBRARIES := libc libcutils libnetutils
 LOCAL_MODULE = dhcpcd
-LOCAL_CFLAGS := -D_POSIX_MONOTONIC_CLOCK -DCLOCK_MONOTONIC
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
diff --git a/android.conf b/android.conf
index 54006c7..bde048c 100644..100755
--- a/android.conf
+++ b/android.conf
@@ -3,4 +3,5 @@
 
 interface wlan0
 # dhcpcd-run-hooks uses these options.
-option subnet_mask, routers, domain_name_servers
+option subnet_mask, routers, domain_name_servers, domain_name, domain_search
+
diff --git a/dhcpcd-hooks/20-dns.conf b/dhcpcd-hooks/20-dns.conf
index 6165824..d19c6a9 100644..100755
--- a/dhcpcd-hooks/20-dns.conf
+++ b/dhcpcd-hooks/20-dns.conf
@@ -18,12 +18,22 @@ set_dns_props()
     for i in 1 2 3 4; do
         setprop dhcp.${intf}.dns${i} ""
     done
-    
+
     count=1
     for dnsaddr in ${new_domain_name_servers}; do
         setprop dhcp.${intf}.dns${count} ${dnsaddr}
         count=$(($count + 1))
     done
+
+    separator=" "
+    if [ -z "$new_domain_name" ]; then
+       separator=""
+    else
+        if [ -z "$new_domain_search" ]; then
+            separator=""
+        fi
+    fi
+    setprop dhcp.${interface}.domain "${new_domain_name}$separator${new_domain_search}"
 }
 
 unset_dns_props()
@@ -31,6 +41,8 @@ unset_dns_props()
     for i in 1 2 3 4; do
         setprop dhcp.${intf}.dns${i} ""
     done
+
+    setprop dhcp.${interface}.domain ""
 }
 
 case "${reason}" in
diff --git a/dhcpcd.c b/dhcpcd.c
index 8a008a0..bac33f3 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -73,7 +73,7 @@ const char copyright[] = "Copyright (c) 2006-2012 Roy Marples";
 #include "signals.h"
 
 #ifdef ANDROID
-#include <linux/capability.h>
+#include <sys/capability.h>
 #include <linux/prctl.h>
 #include <cutils/properties.h>
 #include <private/android_filesystem_config.h>