commit f1792692854c945ee308cba92168092109acc89c
author android-build-team Robot <android-build-team-robot@google.com> Sun Jan 07 08:20:33 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Jan 07 08:20:33 2018 +0000
tree 40b5f91c10af27c34393dcb8c69dce1379af48db
parent a5d0cfcb67221ef9365fb0679df8b23c2d2964d6
parent 8deab37e9714de148086643f01b243724da4ccd6

Snap for 4531101 from 8deab37e9714de148086643f01b243724da4ccd6 to pi-release

Change-Id: Ib26b4155ea9adb4148d332c252d403b34c7f7268

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