| diff --git a/bionic/libc/dns/resolv/res_state.c b/bionic/libc/dns/resolv/res_state.c |
| index 16185b3..747467d 100644 |
| --- a/bionic/libc/dns/resolv/res_state.c |
| +++ b/bionic/libc/dns/resolv/res_state.c |
| @@ -116,32 +116,7 @@ _res_thread_get(void) |
| rt = pthread_getspecific( _res_key ); |
| |
| if (rt != NULL) { |
| - /* We already have one thread-specific DNS state object. |
| - * Check the serial value for any changes to net.* properties */ |
| - D("%s: Called for tid=%d rt=%p rt->pi=%p rt->serial=%d", |
| - __FUNCTION__, gettid(), rt, rt->_pi, rt->_serial); |
| - if (rt->_pi == NULL) { |
| - /* The property wasn't created when _res_thread_get() was |
| - * called the last time. This should only happen very |
| - * early during the boot sequence. First, let's try to see if it |
| - * is here now. */ |
| - //rt->_pi = (struct prop_info*) __system_property_find("net.change"); |
| - //if (rt->_pi == NULL) { |
| - /* Still nothing, return current state */ |
| - // D("%s: exiting for tid=%d rt=%d since system property not found", |
| - // __FUNCTION__, gettid(), rt); |
| - // return rt; |
| - //} |
| - } |
| - //if (rt->_serial == __system_property_serial(rt->_pi)) { |
| - /* Nothing changed, so return the current state */ |
| - // D("%s: tid=%d rt=%p nothing changed, returning", |
| - // __FUNCTION__, gettid(), rt); |
| - // return rt; |
| - //} |
| - /* Update the recorded serial number, and go reset the state */ |
| - //rt->_serial = __system_property_serial(rt->_pi); |
| - goto RESET_STATE; |
| + return rt; |
| } |
| |
| /* It is the first time this function is called in this thread, |
| @@ -154,11 +129,10 @@ _res_thread_get(void) |
| D("%s: tid=%d Created new DNS state rt=%p", |
| __FUNCTION__, gettid(), rt); |
| |
| -RESET_STATE: |
| /* Reset the state, note that res_ninit() can now properly reset |
| * an existing state without leaking memory. |
| */ |
| - D("%s: tid=%d, rt=%p, resetting DNS state (options RES_INIT=%d)", |
| + D("%s: tid=%d, rt=%p, setting DNS state (options RES_INIT=%d)", |
| __FUNCTION__, gettid(), rt, (rt->_nres->options & RES_INIT) != 0); |
| if ( res_ninit( rt->_nres ) < 0 ) { |
| /* This should not happen */ |
| diff --git a/bionic/libc/include/resolv.h b/bionic/libc/include/resolv.h |
| index 75f1f18..b0e030e 100644 |
| --- a/bionic/libc/include/resolv.h |
| +++ b/bionic/libc/include/resolv.h |
| @@ -90,7 +90,7 @@ typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns, |
| /* |
| * Global defines and variables for resolver stub. |
| */ |
| -# define MAXNS 3 /* max # name servers we'll track */ |
| +# define MAXNS 4 /* max # name servers we'll track */ |
| # define MAXDFLSRCH 3 /* # default domain levels to try */ |
| # define MAXDNSRCH 6 /* max # domains in search path */ |
| # define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */ |