[Pkg-voip-commits] [SCM] reSIProcate branch, debian-wheezy, updated. debian/1.8.5-2-2-g5cce770

[Daniel Pocock]

The following commit has been merged in the debian-wheezy branch:
commit 5cce7703aa3151f799f7d6f653ddc3f4ed20acdc
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Thu Mar 21 20:32:12 2013 +0100

    log an error if TLS mappings file missing

diff --git a/debian/changelog b/debian/changelog
index 1a592b3..e5b1abb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at 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 --git a/debian/patches/0003-log-an-error-if-TLS-mappings-file-missing.patch b/debian/patches/0003-log-an-error-if-TLS-mappings-file-missing.patch
new file mode 100644
index 0000000..92475f5
--- /dev/null
+++ b/debian/patches/0003-log-an-error-if-TLS-mappings-file-missing.patch
@@ -0,0 +1,20 @@
+From: Daniel Pocock <daniel at 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 --git a/debian/patches/series b/debian/patches/series
index 61baa95..9dbb176 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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

-- 
reSIProcate