From 18b36f5dcfcb75096f804d2cf6b74bc6f27f9ad1 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 28 Apr 2016 11:43:41 +0200 Subject: resolv: Remove RFC1535 conditionals --- resolv/res_init.c | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'resolv/res_init.c') diff --git a/resolv/res_init.c b/resolv/res_init.c index da1f79e7c0..407e6091e7 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -85,7 +85,6 @@ #include /* 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) -- cgit v1.2.3