From: Reinhard Tartler <siretart@tauware.de>
Date: Tue, 31 Mar 2009 21:43:58 +0200
Subject: change default syslog facility from LOG_LOCAL6 to LOG_DAEMON

---
 docs/docbook/adminguide.xml        | 6 ++++++
 lib/bbstored/BackupStoreDaemon.cpp | 2 +-
 lib/common/Logging.cpp             | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

--- a/docs/docbook/adminguide.xml
+++ b/docs/docbook/adminguide.xml
@@ -286,6 +286,12 @@
         <para><emphasis role="bold">Note:</emphasis> Separators must be tabs,
         otherwise these entries will be ignored.</para>
 
+        <para><emphasis role="bold">Note2:</emphasis> The packaged
+        debian and ubuntu versions of boxbackup do not log to local6,
+        but to the more standard 'daemon' facility. This means you
+        should not have anything to do to your syslog configuration,
+        since it is configured to be logged by default.</para>
+
         <programlisting>touch /var/log/box
 touch /var/log/raidfile</programlisting>
 
--- a/lib/bbstored/BackupStoreDaemon.cpp
+++ b/lib/bbstored/BackupStoreDaemon.cpp
@@ -203,7 +203,7 @@
 				SetProcessTitle("housekeeping, idle");
 				whichSocket = 1;
 				// Change the log name
-				::openlog("bbstored/hk", LOG_PID, LOG_LOCAL6);
+				::openlog("bbstored/hk", LOG_PID, LOG_DAEMON);
 				// Log that housekeeping started
 				BOX_INFO("Housekeeping process started");
 				// Ignore term and hup
--- a/lib/common/Logging.cpp
+++ b/lib/common/Logging.cpp
@@ -411,7 +411,7 @@
 	return true;
 }
 
-Syslog::Syslog() : mFacility(LOG_LOCAL6)
+Syslog::Syslog() : mFacility(LOG_DAEMON)
 {
 	::openlog("Box Backup", LOG_PID, mFacility);
 }
@@ -454,8 +454,8 @@
 	#undef CASE_RETURN
 
 	BOX_ERROR("Unknown log facility '" << rFacility << "', "
-		"using default LOCAL6");
-	return LOG_LOCAL6;
+		"using default DAEMON");
+	return LOG_DAEMON;
 }
 
 bool FileLogger::Log(Log::Level Level, const std::string& file, int line,