From owner-svn-src-stable@freebsd.org Fri Dec 18 07:00:44 2015 Return-Path: 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 9B130A4A1ED; Fri, 18 Dec 2015 07:00:44 +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 5CB1610FF; Fri, 18 Dec 2015 07:00:44 +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 tBI70htY075276; Fri, 18 Dec 2015 07:00:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBI70hDH075271; Fri, 18 Dec 2015 07:00:43 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201512180700.tBI70hDH075271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 18 Dec 2015 07:00:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r292431 - stable/9/lib/libc/resolv X-SVN-Group: stable-9 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2015 07:00:44 -0000 Author: ngie Date: Fri Dec 18 07:00:42 2015 New Revision: 292431 URL: https://svnweb.freebsd.org/changeset/base/292431 Log: MFstable/10 r292430: 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/9/lib/libc/resolv/res_init.c stable/9/lib/libc/resolv/res_mkquery.c stable/9/lib/libc/resolv/res_mkupdate.c stable/9/lib/libc/resolv/res_query.c stable/9/lib/libc/resolv/res_send.c Directory Properties: stable/9/ (props changed) stable/9/lib/ (props changed) stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/resolv/res_init.c ============================================================================== --- stable/9/lib/libc/resolv/res_init.c Fri Dec 18 06:58:44 2015 (r292430) +++ stable/9/lib/libc/resolv/res_init.c Fri Dec 18 07:00:42 2015 (r292431) @@ -115,7 +115,9 @@ __FBSDID("$FreeBSD$"); /*% Options. Should all be left alone. */ #define RESOLVSORT -#define DEBUG +#ifndef DEBUG +#define DEBUG +#endif #ifdef SOLARIS2 #include Modified: stable/9/lib/libc/resolv/res_mkquery.c ============================================================================== --- stable/9/lib/libc/resolv/res_mkquery.c Fri Dec 18 06:58:44 2015 (r292430) +++ stable/9/lib/libc/resolv/res_mkquery.c Fri Dec 18 07:00:42 2015 (r292431) @@ -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/9/lib/libc/resolv/res_mkupdate.c ============================================================================== --- stable/9/lib/libc/resolv/res_mkupdate.c Fri Dec 18 06:58:44 2015 (r292430) +++ stable/9/lib/libc/resolv/res_mkupdate.c Fri Dec 18 07:00:42 2015 (r292431) @@ -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/9/lib/libc/resolv/res_query.c ============================================================================== --- stable/9/lib/libc/resolv/res_query.c Fri Dec 18 06:58:44 2015 (r292430) +++ stable/9/lib/libc/resolv/res_query.c Fri Dec 18 07:00:42 2015 (r292431) @@ -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/9/lib/libc/resolv/res_send.c ============================================================================== --- stable/9/lib/libc/resolv/res_send.c Fri Dec 18 06:58:44 2015 (r292430) +++ stable/9/lib/libc/resolv/res_send.c Fri Dec 18 07:00:42 2015 (r292431) @@ -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"