[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#703650: unblock: resiprocate - added missing error message, more sane TLS config



Package: release.debian.org
Severity: normal

A user reported a problem with the default TLS config upstream, it is
fixed by this debdiff

diff -Nru resiprocate-1.8.5/debian/changelog resiprocate-1.8.5/debian/changelog
--- resiprocate-1.8.5/debian/changelog	2013-03-17 12:33:44.000000000 +0100
+++ resiprocate-1.8.5/debian/changelog	2013-03-21 20:31:23.000000000 +0100
@@ -1,3 +1,9 @@
+resiprocate (1.8.5-3) unstable; urgency=low
+
+  * log an error if TLS mappings file missing (Closes: #703644)
+
+ -- Daniel Pocock <daniel@pocock.com.au>  Thu, 21 Mar 2013 20:12:33 +0100
+
 resiprocate (1.8.5-2) unstable; urgency=low
 
   * Remove proxy-auth headers after validating them (Closes: #697341)
diff -Nru resiprocate-1.8.5/debian/conf/repro.config resiprocate-1.8.5/debian/conf/repro.config
--- resiprocate-1.8.5/debian/conf/repro.config	2012-08-08 15:13:05.000000000 +0200
+++ resiprocate-1.8.5/debian/conf/repro.config	2013-03-21 20:10:58.000000000 +0100
@@ -429,6 +429,9 @@
 # the holder of a particular certificate to use any of the `mapped'
 # `From:' addresses specified in the mappings file
 #
+# Default: there is no default value: if this filename is not specified,
+#          repro will not look for it
+#
 # File format:
 # common name<TAB><mapping>,<mapping>,...
 #
@@ -436,7 +439,7 @@
 #        <TAB> is exactly one tab
 #        <mapping> is `user@domain' or just `domain'
 #
-CommonNameMappings = /etc/repro/tlsUserMappings.txt
+#CommonNameMappings = /etc/repro/tlsUserMappings.txt
 
 
 ########################################################
diff -Nru resiprocate-1.8.5/debian/patches/0003-log-an-error-if-TLS-mappings-file-missing.patch resiprocate-1.8.5/debian/patches/0003-log-an-error-if-TLS-mappings-file-missing.patch
--- resiprocate-1.8.5/debian/patches/0003-log-an-error-if-TLS-mappings-file-missing.patch	1970-01-01 01:00:00.000000000 +0100
+++ resiprocate-1.8.5/debian/patches/0003-log-an-error-if-TLS-mappings-file-missing.patch	2013-03-21 20:11:27.000000000 +0100
@@ -0,0 +1,20 @@
+From: Daniel Pocock <daniel@pocock.com.au>
+Date: Thu, 21 Mar 2013 20:09:05 +0100
+Subject: log an error if TLS mappings file missing
+
+---
+ repro/ReproRunner.cxx |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/repro/ReproRunner.cxx b/repro/ReproRunner.cxx
+index 8aaa7c3..9a77e6e 100644
+--- a/repro/ReproRunner.cxx
++++ b/repro/ReproRunner.cxx
+@@ -1248,6 +1248,7 @@ ReproRunner::loadCommonNameMappings()
+    ifstream mappingsFile(mappingsFileName.c_str());
+    if(!mappingsFile)
+    {
++      ErrLog(<< "failed to open mappings file: " << mappingsFileName << ", aborting");
+       throw std::runtime_error("Error opening/reading mappings file");
+    }
+ 
diff -Nru resiprocate-1.8.5/debian/patches/series resiprocate-1.8.5/debian/patches/series
--- resiprocate-1.8.5/debian/patches/series	2013-03-17 12:28:37.000000000 +0100
+++ resiprocate-1.8.5/debian/patches/series	2013-03-21 20:11:27.000000000 +0100
@@ -1,2 +1,3 @@
 0001-remove-Proxy-Authorization-headers-for-successful-Di.patch
 0002-discard-repeated-requests-received-over-reliable-tra.patch
+0003-log-an-error-if-TLS-mappings-file-missing.patch

Reply to: