From e68111fbd63e84b66bd9e03b42721c79230b9b6d Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 19 Jun 2017 13:18:45 +0200
Subject: [PATCH] resolv: Remove DEBUG preprocessor conditionals from
 res_setoptions

---
 ChangeLog         |  5 +++++
 resolv/res_init.c | 21 ---------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 089e949fcb..0e2f1417ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-19  Florian Weimer  <fweimer@redhat.com>
+
+	* resolv/res_init.c (res_setoptions): Remove DEBUG preprocessor
+	conditionals.
+
 2017-06-19  Florian Weimer  <fweimer@redhat.com>
 
 	* resolv/res-close.c: New file.
diff --git a/resolv/res_init.c b/resolv/res_init.c
index eb380d3d56..eb24fca3a6 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -83,9 +83,6 @@
 #include <sys/types.h>
 #include <inet/net-internal.h>
 
-/* Options.  Should all be left alone. */
-/* #undef DEBUG */
-
 static void res_setoptions (res_state, const char *, const char *)
      internal_function;
 
@@ -383,11 +380,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
 	const char *cp = options;
 	int i;
 
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_setoptions(\"%s\", \"%s\")...\n",
-		       options, source);
-#endif
 	while (*cp) {
 		/* skip leading and inner runs of spaces */
 		while (*cp == ' ' || *cp == '\t')
@@ -399,10 +391,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
 				statp->ndots = i;
 			else
 				statp->ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\tndots=%d\n", statp->ndots);
-#endif
 		} else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) {
 			i = atoi(cp + sizeof("timeout:") - 1);
 			if (i <= RES_MAXRETRANS)
@@ -415,15 +403,6 @@ res_setoptions(res_state statp, const char *options, const char *source) {
 				statp->retry = i;
 			else
 				statp->retry = RES_MAXRETRY;
-		} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-			if (!(statp->options & RES_DEBUG)) {
-				printf(";; res_setoptions(\"%s\", \"%s\")..\n",
-				       options, source);
-				statp->options |= RES_DEBUG;
-			}
-			printf(";;\tdebug\n");
-#endif
 		} else {
 		  static const struct
 		  {