From 3b4405aba93729eead9f8f006d426f24fc4c3d78 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 20 May 2005 01:19:43 +0000
Subject: [PATCH] 1837.   [bug]           Compile time option ISC_FACILITY was
 not effective                         for 'named -u <user>'.  [RT #13714]

---
 CHANGES              |  3 ++-
 bin/named/log.c      | 14 +++++++++++++-
 doc/private/branches |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 906c727d75..ea4c1e16a6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -73,7 +73,8 @@
 
 1838.	[placeholder]	rt13707
 
-1837.	[placeholder]	rt13714
+1837.	[bug]		Compile time option ISC_FACILITY was not effective
+			for 'named -u <user>'.  [RT #13714]
 
 1836.	[cleanup]	Silence compiler warnings in hash_test.c.
 
diff --git a/bin/named/log.c b/bin/named/log.c
index 3bbbc2eff5..fb5ad506f2 100644
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.40 2005/04/29 00:22:27 marka Exp $ */
+/* $Id: log.c,v 1.41 2005/05/20 01:19:42 marka Exp $ */
 
 /*! \file */
 
@@ -157,6 +157,9 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg) {
 isc_result_t
 ns_log_setsafechannels(isc_logconfig_t *lcfg) {
 	isc_result_t result;
+#if ISC_FACILITY != LOG_DAEMON
+	isc_logdestination_t destination;
+#endif
 
 	if (! ns_g_logstderr) {
 		result = isc_log_createchannel(lcfg, "default_debug",
@@ -175,6 +178,15 @@ ns_log_setsafechannels(isc_logconfig_t *lcfg) {
 		isc_log_setdebuglevel(ns_g_lctx, ns_g_debuglevel);
 	}
 
+#if ISC_FACILITY != LOG_DAEMON
+	destination.facility = ISC_FACILITY;
+	result = isc_log_createchannel(lcfg, "default_syslog",
+				       ISC_LOG_TOSYSLOG, ISC_LOG_INFO,
+				       &destination, 0);
+	if (result != ISC_R_SUCCESS)
+		goto cleanup;
+#endif
+
 	result = ISC_R_SUCCESS;
 
  cleanup:
diff --git a/doc/private/branches b/doc/private/branches
index 19f6380fad..94c74fbddd 100644
--- a/doc/private/branches
+++ b/doc/private/branches
@@ -33,7 +33,7 @@ rt13606				open	marka	// TSIG SHA256
 rt13662				new	
 rt13694				new	
 rt13707				new	
-rt13714				new	
+rt13714				13714	
 rt13753				new	
 rt13754				new	
 rt13771				new