lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

resolv: Remove RFC1535 conditionals

Browse Source
This commit is contained in:
Florian Weimer
2016-04-28 11:43:41 +02:00
parent 74a6983155
commit 18b36f5dcf
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2016-04-28 Florian Weimer <fweimer@redhat.com>
* resolv/res_init.c (RFC1535): Do not define. Remove
RFC1535 preprocessor conditionals.
* resolv/README: Update. Do not claim strict RFC 1535 compliance
because there configuration options which make the resolver
behavior different.
2016-04-28 Florian Weimer <fweimer@redhat.com> 2016-04-28 Florian Weimer <fweimer@redhat.com>
* resolv/gethnamaddr.c (RESOLVSORT): Do not define. Remove * resolv/gethnamaddr.c (RESOLVSORT): Do not define. Remove

4
resolv/README
View File

@ -18,10 +18,6 @@ Differences
The resolver in the GNU C Library still differs from what's in BIND The resolver in the GNU C Library still differs from what's in BIND
8.2.3-T5B: 8.2.3-T5B:
* The resolver in glibc strictly adheres to the recommendations in RFC
1535. BIND 8.2.3-T5B seems to relax those rules a bit (see the code
that's wrapped in `#ifndef RFC1535').
* The RES_DEBUG option (`options debug' in /etc/resolv.conf) has been * The RES_DEBUG option (`options debug' in /etc/resolv.conf) has been
disabled. disabled.

27
resolv/res_init.c
View File

@ -85,7 +85,6 @@
#include <not-cancel.h> #include <not-cancel.h>
/* Options. Should all be left alone. */ /* Options. Should all be left alone. */
#define RFC1535
/* #undef DEBUG */ /* #undef DEBUG */
static void res_setoptions (res_state, const char *, const char *) static void res_setoptions (res_state, const char *, const char *)
@ -133,9 +132,6 @@ __res_vinit(res_state statp, int preinit) {
int havesearch = 0; int havesearch = 0;
int nsort = 0; int nsort = 0;
char *net; char *net;
#ifndef RFC1535
int dots;
#endif
statp->_u._ext.initstamp = __res_initstamp; statp->_u._ext.initstamp = __res_initstamp;
if (!preinit) { if (!preinit) {
@ -394,29 +390,6 @@ __res_vinit(res_state statp, int preinit) {
*pp++ = statp->defdname; *pp++ = statp->defdname;
*pp = NULL; *pp = NULL;
#ifndef RFC1535
dots = 0;
for (cp = statp->defdname; *cp; cp++)
dots += (*cp == '.');
cp = statp->defdname;
while (pp < statp->dnsrch + MAXDFLSRCH) {
if (dots < LOCALDOMAINPARTS)
break;
cp = __rawmemchr(cp, '.') + 1; /* we know there is one */
*pp++ = cp;
dots--;
}
*pp = NULL;
#ifdef DEBUG
if (statp->options & RES_DEBUG) {
printf(";; res_init()... default dnsrch list:\n");
for (pp = statp->dnsrch; *pp; pp++)
printf(";;\t%s\n", *pp);
printf(";;\t..END..\n");
}
#endif
#endif /* !RFC1535 */
} }
if ((cp = getenv("RES_OPTIONS")) != NULL) if ((cp = getenv("RES_OPTIONS")) != NULL)