Merge "Revert "clatd.c: remove unsetenv("ANDROID_DNS_MODE")""android-wear-8.0.0_r1android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7

1 files changed, 5 insertions, 0 deletions

diff --git a/clatd.c b/clatd.c
index 0b69238..c579df0 100644
--- a/clatd.c
+++ b/clatd.c
@@ -503,6 +503,11 @@ int main(int argc, char **argv) {
     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);