From owner-svn-src-stable@freebsd.org  Fri Dec 18 06:58:46 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1634A4A062;
 Fri, 18 Dec 2015 06:58:45 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AD0E21F08;
 Fri, 18 Dec 2015 06:58:45 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBI6wiqD074760;
 Fri, 18 Dec 2015 06:58:44 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBI6wiU1074754;
 Fri, 18 Dec 2015 06:58:44 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201512180658.tBI6wiU1074754@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 18 Dec 2015 06:58:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r292430 - stable/10/lib/libc/resolv
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Dec 2015 06:58:46 -0000

Author: ngie
Date: Fri Dec 18 06:58:44 2015
New Revision: 292430
URL: https://svnweb.freebsd.org/changeset/base/292430

Log:
  MFC r292250:
  
  Allow users override `DEBUG` on the command line via DEBUG_FLAGS="-DDEBUG" with
  lib/libc/resolv by conditionalizing its definition
  
  Reviewed by: ume, vangyzen
  Differential Revision: https://reviews.freebsd.org/D4519

Modified:
  stable/10/lib/libc/resolv/res_init.c
  stable/10/lib/libc/resolv/res_mkquery.c
  stable/10/lib/libc/resolv/res_mkupdate.c
  stable/10/lib/libc/resolv/res_query.c
  stable/10/lib/libc/resolv/res_send.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/resolv/res_init.c
==============================================================================
--- stable/10/lib/libc/resolv/res_init.c	Fri Dec 18 06:13:18 2015	(r292429)
+++ stable/10/lib/libc/resolv/res_init.c	Fri Dec 18 06:58:44 2015	(r292430)
@@ -115,7 +115,9 @@ __FBSDID("$FreeBSD$");
 
 /*% Options.  Should all be left alone. */
 #define RESOLVSORT
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 
 #ifdef SOLARIS2
 #include <sys/systeminfo.h>

Modified: stable/10/lib/libc/resolv/res_mkquery.c
==============================================================================
--- stable/10/lib/libc/resolv/res_mkquery.c	Fri Dec 18 06:13:18 2015	(r292429)
+++ stable/10/lib/libc/resolv/res_mkquery.c	Fri Dec 18 06:58:44 2015	(r292430)
@@ -83,7 +83,9 @@ __FBSDID("$FreeBSD$");
 #include "port_after.h"
 
 /* Options.  Leave them on. */
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 
 extern const char *_res_opcodes[];
 

Modified: stable/10/lib/libc/resolv/res_mkupdate.c
==============================================================================
--- stable/10/lib/libc/resolv/res_mkupdate.c	Fri Dec 18 06:13:18 2015	(r292429)
+++ stable/10/lib/libc/resolv/res_mkupdate.c	Fri Dec 18 06:58:44 2015	(r292430)
@@ -54,7 +54,9 @@ __FBSDID("$FreeBSD$");
 #include "port_after.h"
 
 /* Options.  Leave them on. */
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 #define MAXPORT 1024
 
 static int getnum_str(u_char **, u_char *);

Modified: stable/10/lib/libc/resolv/res_query.c
==============================================================================
--- stable/10/lib/libc/resolv/res_query.c	Fri Dec 18 06:13:18 2015	(r292429)
+++ stable/10/lib/libc/resolv/res_query.c	Fri Dec 18 06:58:44 2015	(r292430)
@@ -88,7 +88,9 @@ __FBSDID("$FreeBSD$");
 #include "port_after.h"
 
 /* Options.  Leave them on. */
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 
 #if PACKETSZ > 1024
 #define MAXPACKET	PACKETSZ

Modified: stable/10/lib/libc/resolv/res_send.c
==============================================================================
--- stable/10/lib/libc/resolv/res_send.c	Fri Dec 18 06:13:18 2015	(r292429)
+++ stable/10/lib/libc/resolv/res_send.c	Fri Dec 18 06:58:44 2015	(r292430)
@@ -119,7 +119,9 @@ __FBSDID("$FreeBSD$");
 #include "un-namespace.h"
 
 /* Options.  Leave them on. */
-#define DEBUG
+#ifndef	DEBUG
+#define	DEBUG
+#endif
 #include "res_debug.h"
 #include "res_private.h"