[cpp-sp] 03/05: Fix facility in the native.logger configuration file

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.4.3+dfsg-2
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=f889d77bbf532e9a92345beaaac11b7a491a2e53

commit f889d77bbf532e9a92345beaaac11b7a491a2e53
Author: Russ Allbery <rra at debian.org>
AuthorDate: Sun Sep 25 14:32:47 2011 -0700

    Fix facility in the native.logger configuration file
    
    * Change the default native.logger facility to 3 from 3 << 3, since the
      current log4cpp does indeed do the facility shift.  Thanks to Jeremy
      Maryott for the report.  (Closes: #638594)
---
 configs/native.logger.in | 6 +++---
 debian/changelog         | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configs/native.logger.in b/configs/native.logger.in
index dc5f3c6..102369c 100644
--- a/configs/native.logger.in
+++ b/configs/native.logger.in
@@ -44,11 +44,11 @@ log4j.category.XMLTooling.libcurl=INFO
 #log4j.appender.warn_log.threshold=WARN
 
 # Use syslog instead, since then at least the messages will go somewhere.
-# That facility is (3 << 3) or LOG_DAEMON, since log4cpp apparently
-# doesn't recognize symbolic log facilities.
+# That facility is LOG_DAEMON, since log4cpp apparently doesn't recognize
+# symbolic log facilities.
 #
 # This is a Debian-specific change.
 log4j.appender.native_log=org.apache.log4j.LocalSyslogAppender
 log4j.appender.native_log.syslogName=shibboleth-sp
-log4j.appender.native_log.facility=24
+log4j.appender.native_log.facility=3
 log4j.appender.native_log.layout=org.apache.log4j.BasicLayout
diff --git a/debian/changelog b/debian/changelog
index 4082213..7812a61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,12 @@ shibboleth-sp2 (2.4.3+dfsg-2) UNRELEASED; urgency=low
   * Build-depend on g++-4.4 on armel and build with that compiler since
     g++ 4.5 and 4.6 die with an internal compiler error even with no
     optimization.  Patch from Peter Green.  (Closes: #623263)
+  * Change the default native.logger facility to 3 from 3 << 3, since the
+    current log4cpp does indeed do the facility shift.  Thanks to Jeremy
+    Maryott for the report.  (Closes: #638594)
   * Update the upstream download location in debian/copyright.
 
- -- Russ Allbery <rra at debian.org>  Tue, 26 Jul 2011 18:22:28 -0700
+ -- Russ Allbery <rra at debian.org>  Sun, 25 Sep 2011 14:32:36 -0700
 
 shibboleth-sp2 (2.4.3+dfsg-1) unstable; urgency=low
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.