diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-28 09:21:54 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-28 09:21:54 +0200 |
| commit | b14f097d7ef032db746b885ec05b167e54b8fa9c (patch) | |
| tree | ec0cb2d8a2de784ed9d709ecdf9cc82dd1815fe1 /resolv/res_query.c | |
| parent | e1214916e74fa6aa7984cb78e68c38d49e5834a6 (diff) | |
| parent | e73e694e38b7b222eec3ec5897eb507d88bb8928 (diff) | |
| download | glibc-b14f097d7ef032db746b885ec05b167e54b8fa9c.tar glibc-b14f097d7ef032db746b885ec05b167e54b8fa9c.tar.gz glibc-b14f097d7ef032db746b885ec05b167e54b8fa9c.tar.bz2 glibc-b14f097d7ef032db746b885ec05b167e54b8fa9c.zip | |
Merge commit 'origin/master' into fedora/master
Diffstat (limited to 'resolv/res_query.c')
| -rw-r--r-- | resolv/res_query.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/resolv/res_query.c b/resolv/res_query.c index 9ffb3e3685..5ff352e2fc 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -147,7 +147,7 @@ __libc_res_nquery(res_state statp, if (n > 0) { if ((oflags & RES_F_EDNS0ERR) == 0 - && (statp->options & RES_USE_EDNS0) != 0) + && (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0) { n = __res_nopt(statp, n, query1, bufsize, anslen / 2); if (n < 0) @@ -169,7 +169,7 @@ __libc_res_nquery(res_state statp, NULL, query2, bufsize - nused); if (n > 0 && (oflags & RES_F_EDNS0ERR) == 0 - && (statp->options & RES_USE_EDNS0) != 0) + && (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0) n = __res_nopt(statp, n, query2, bufsize - nused - n, anslen / 2); nquery2 = n; @@ -184,7 +184,7 @@ __libc_res_nquery(res_state statp, if (n > 0 && (oflags & RES_F_EDNS0ERR) == 0 - && (statp->options & RES_USE_EDNS0) != 0) + && (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0) n = __res_nopt(statp, n, query1, bufsize, anslen); nquery1 = n; @@ -203,7 +203,7 @@ __libc_res_nquery(res_state statp, } if (__builtin_expect (n <= 0, 0)) { /* If the query choked with EDNS0, retry without EDNS0. */ - if ((statp->options & RES_USE_EDNS0) != 0 + if ((statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0 && ((oflags ^ statp->_flags) & RES_F_EDNS0ERR) != 0) { statp->_flags |= RES_F_EDNS0ERR; #ifdef DEBUG |