resolv: Remove RFC1535 conditionals

diff --git a/ChangeLog b/ChangeLog
index 47ef7a0901a022e587527fd48aa3c34c6203d2f4..26147f54e31a280f37214de5832026cf0fa8550a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * resolv/gethnamaddr.c (RESOLVSORT): Do not define.  Remove

diff --git a/resolv/README b/resolv/README
index 1296e1c5bd47a30c6d114218ed8d511e847439d9..17aa631c924ac0f95e32bc694ef5be38c485c933 100644 (file)
--- a/resolv/README
+++ b/resolv/README
@@ -18,10 +18,6 @@ Differences
 The resolver in the GNU C Library still differs from what's in BIND
 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
   disabled.
 

diff --git a/resolv/res_init.c b/resolv/res_init.c
index da1f79e7c07c131f165596abae2a8f5db8b095c1..407e6091e79b9730aca40935f9f7d853b3da576f 100644 (file)
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -85,7 +85,6 @@
 #include <not-cancel.h>
 
 /* Options.  Should all be left alone. */
-#define RFC1535
 /* #undef DEBUG */
 
 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 nsort = 0;
        char *net;
-#ifndef RFC1535
-       int dots;
-#endif
        statp->_u._ext.initstamp = __res_initstamp;
 
        if (!preinit) {
@@ -394,29 +390,6 @@ __res_vinit(res_state statp, int preinit) {
                *pp++ = statp->defdname;
                *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)