commit 6d45688c4e7aabb368705ba813b077cefd2b6d00
author Erik Kline <ek@google.com> Fri Mar 30 09:11:54 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 30 09:11:54 2018 +0000
tree afa8c34247f3af38f77be45a172c8e80adde1418
parent a96b67ca818519ec214422522b83a413f48e4a87
parent c41e1fa3054df40aadc1da2849dd2e51c87326f5

When manipulating flags, |= rather than += am: f1c79f8dac
am: c41e1fa305

Change-Id: I10367d3b83acce55e3492812fd04cbdf5f0e6e1a

dns64.c

diff --git a/dns64.c b/dns64.c
index a9ca61d..ed28eb0 100644
--- a/dns64.c
+++ b/dns64.c
@@ -49,7 +49,7 @@
 
   // Be sure to query local DNS64 servers, bypassing Private DNS (if enabled).
   if (net_id != NETID_UNSET) {
-    net_id += NETID_USE_LOCAL_NAMESERVERS;
+    net_id |= NETID_USE_LOCAL_NAMESERVERS;
   }
 
   status = android_getaddrinfofornet(ipv4_name, NULL, &hints, net_id, MARK_UNSET, &result);