From: Mark Andrews <marka@isc.org>
Date: Sat, 5 Jan 2013 20:56:10 +0000 (+1100)
Subject: 3450.   [bug]           Stop logfileconfig system test spam system logs.
X-Git-Tag: v9.10.0a1~618
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=25b95d31ce658326510bef979cf2909c6eddc428;p=thirdparty%2Fbind9.git

3450.   [bug]           Stop logfileconfig system test spam system logs.
                        [RT #32315]

Squashed commit of the following:

commit ad40744e2c7dc253b70857bb229def5dd194b418
Author: Mark Andrews <marka@isc.org>
Date:   Fri Jan 4 17:24:45 2013 +1100

    logfileconfig spams the system log files
---

diff --git a/CHANGES b/CHANGES
index 608b06d8011..e236b427724 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3450.	[bug]		Stop logfileconfig system test spam system logs.
+			[RT #32315]
+
 3449.	[bug]		gen.c: use the pre-processor to construct format
 			strings so that compiler can perform sanity checks;
 			check the snprintf results. [RT #17576]
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index ed94ec60687..6894f74cb33 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -122,6 +122,7 @@ EXTERN isc_boolean_t		ns_g_coreok		INIT(ISC_TRUE);
 EXTERN const char *		ns_g_chrootdir		INIT(NULL);
 EXTERN isc_boolean_t		ns_g_foreground		INIT(ISC_FALSE);
 EXTERN isc_boolean_t		ns_g_logstderr		INIT(ISC_FALSE);
+EXTERN isc_boolean_t		ns_g_nosyslog		INIT(ISC_FALSE);
 
 EXTERN const char *		ns_g_defaultsessionkeyfile
 					INIT(NS_LOCALSTATEDIR "/run/named/"
diff --git a/bin/named/log.c b/bin/named/log.c
index 5d19dcb205c..20b01bbe461 100644
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -201,7 +201,7 @@ isc_result_t
 ns_log_setdefaultcategory(isc_logconfig_t *lcfg) {
 	isc_result_t result;
 
-	if (! ns_g_logstderr) {
+	if (! ns_g_logstderr && ! ns_g_nosyslog) {
 		result = isc_log_usechannel(lcfg, "default_syslog",
 					    ISC_LOGCATEGORY_DEFAULT, NULL);
 		if (result != ISC_R_SUCCESS)
diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index eb8b2d3371e..46d0c993361 100644
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -246,14 +246,16 @@ channel_fromconf(const cfg_obj_t *channel, isc_logconfig_t *lctx) {
 					isc_result_totext(result));
 			} else
 				(void)isc_stdio_close(fp);
-		} else {
-			syslog(LOG_ERR, "isc_file_isplainfile '%s' failed: %s",
-				dest.file.name, isc_result_totext(result));
-			fprintf(stderr, "isc_file_isplainfile '%s' failed: %s",
-				dest.file.name, isc_result_totext(result));
+			goto done;
 		}
+		if (!ns_g_nosyslog)
+			syslog(LOG_ERR, "isc_file_isplainfile '%s' failed: %s",
+			       dest.file.name, isc_result_totext(result));
+		fprintf(stderr, "isc_file_isplainfile '%s' failed: %s",
+			dest.file.name, isc_result_totext(result));
 	}
 
+ done:
 	return (result);
 }
 
diff --git a/bin/named/main.c b/bin/named/main.c
index 07ac9bc6cc4..843b1e19427 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -535,6 +535,8 @@ parse_command_line(int argc, char *argv[]) {
 			else if (!strncmp(isc_commandline_argument,
 					  "delay=", 6))
 				ns_g_delay = atoi(isc_commandline_argument + 6);
+			else if (!strcmp(isc_commandline_argument, "nosyslog"))
+				ns_g_nosyslog = ISC_TRUE;
 			else
 				fprintf(stderr, "unknown -T flag '%s\n",
 					isc_commandline_argument);
diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index 85c7e845c60..ac940c6f9b7 100644
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -30,7 +30,7 @@ PIPEFILE="named_pipe"
 SYMFILE="named_sym"
 PIDFILE="${THISDIR}/${CONFDIR}/named.pid"
 myRNDC="$RNDC -c ${THISDIR}/${CONFDIR}/rndc.conf"
-myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record,size,mctx -T clienttest -d 99 -U 4"
+myNAMED="$NAMED -c ${THISDIR}/${CONFDIR}/named.conf -m record,size,mctx -T clienttest -T nosyslog -d 99 -U 4"
 
 # Stop the server and run through a series of tests with various config
 # files while controlling the stop/start of the server.
@@ -76,7 +76,7 @@ then
 	cp $DIRCONF named.conf
 	echo > named.run
 	$myRNDC reconfig
-	grep "invalid file" named.run > /dev/null 2>&1
+	grep "configuring logging: invalid file" named.run > /dev/null 2>&1
 	if [ $? -ne 0 ]
 	then
 		echo "I: testing directory as file succeeded (UNEXPECTED)"
@@ -98,7 +98,7 @@ then
 	cp $PIPECONF named.conf
 	echo > named.run
 	$myRNDC reconfig
-	grep "invalid file" named.run > /dev/null 2>&1
+	grep "configuring logging: invalid file" named.run  > /dev/null 2>&1
 	if [ $? -ne 0 ]
 	then
 		echo "I: testing pipe file as log file succeeded (UNEXPECTED)"