commit 8c846c961e513ed7b1fddec1f7a9a63a029ae968
author Jayachandran Chinnakkannu <jayachandranc@google.com> Fri Jan 05 04:11:12 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 05 04:11:12 2018 +0000
tree 40b5f91c10af27c34393dcb8c69dce1379af48db
parent 22f8d1e6b7ac061d9c5affb0071b118eebd97350
parent e8e758f5f9c41f4a29ade5e86259fe7e36dbd389

Merge "Revert "clatd.c: remove unsetenv("ANDROID_DNS_MODE")"" am: 3d7e939b89
am: e8e758f5f9

Change-Id: I9bd53ab05c27c414a7ac06f189ea484e2737852c

clatd.c

diff --git a/clatd.c b/clatd.c
index 0b69238..c579df0 100644
--- a/clatd.c
+++ b/clatd.c
@@ -503,6 +503,11 @@
     exit(1);
   }
 
+  // When run from netd, the environment variable ANDROID_DNS_MODE is set to
+  // "local", but that only works for the netd process itself. Removing the
+  // following line causes XLAT failure in permissive mode.
+  unsetenv("ANDROID_DNS_MODE");
+
   configure_interface(uplink_interface, plat_prefix, &tunnel, net_id);
 
   update_clat_ipv6_address(&tunnel, uplink_interface);