direct logging to stderr iff the '-f' option is doubled

bin/named/include/named/globals.h

@@ -75,6 +75,7 @@ EXTERN const char *		ns_g_conffile		INIT(NS_SYSCONFDIR
 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 char *			ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
 							     "/run/named.pid");

bin/named/log.c

@@ -87,7 +87,7 @@ ns_log_init(void) {
 	/*
 	 * Create and install the default channel.
 	 */
-	if (ns_g_foreground) {
+	if (ns_g_logstderr) {
 		destination.file.stream = stderr;
 		destination.file.name = NULL;
 		destination.file.versions = ISC_LOG_ROLLNEVER;

bin/named/main.c

@@ -163,7 +163,7 @@ library_unexpected_error(char *file, int line, char *format, va_list args) {
 static void
 usage(void) {
 	fprintf(stderr,
-		"usage: named [-c conffile] [-d debuglevel] [-f] [-N number_of_cpus]\n"
+		"usage: named [-c conffile] [-d debuglevel] [-f[f]] [-N number_of_cpus]\n"
 		"             [-p port] [-s] [-t chrootdir] [-u username]\n");
 }
 
@@ -184,6 +184,8 @@ parse_command_line(int argc, char *argv[]) {
 			ns_g_debuglevel = atoi(isc_commandline_argument);
 			break;
 		case 'f':
+			if (ns_g_foreground == ISC_TRUE)
+				ns_g_logstderr = ISC_TRUE;
 			ns_g_foreground = ISC_TRUE;
 			break;
 		case 'N':

bin/named/server.c

@@ -929,7 +929,12 @@ load_configuration(const char *filename, ns_server_t *server,
 	/*
 	 * Configure the logging system.
 	 */
-	{
+	if (ns_g_logstderr) {
+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+			      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
+			      "ignoring named.conf logging statement "
+			      "due to -ff option");
+	} else {
 		dns_c_logginglist_t *clog = NULL;
 		isc_logconfig_t *logc = NULL;