From a1d465f3bd6a23a6c3533f6aa4a39d5cacfa4f22 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 30 Mar 2015 22:31:24 +0300
Subject: [PATCH] Use p11_kit_strerror in logError

---
 pdns/pkcs11signers.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pdns/pkcs11signers.cc b/pdns/pkcs11signers.cc
index 42786dfe58..1066d7c708 100644
--- a/pdns/pkcs11signers.cc
+++ b/pdns/pkcs11signers.cc
@@ -9,6 +9,7 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/foreach.hpp>
+#include <boost/format.hpp>
 #include <p11-kit/p11-kit.h>
 
 #include "pdns/dnssecinfra.hh"
@@ -210,7 +211,8 @@ class Pkcs11Slot {
 
     void logError(const std::string& operation) const {
       if (d_err) {
-        L<<Logger::Error<<"PKCS#11 operation " << operation << " failed: " << d_err << endl;
+        std::string msg = boost::str( boost::format("PKCS#11 operation %s failed: %s (0x%X)") % operation % p11_kit_strerror(d_err) % d_err );
+        L<<Logger::Error<< msg << endl;
       }
     }
   public:
@@ -282,9 +284,10 @@ class Pkcs11Token {
 
     void logError(const std::string& operation) const {
       if (d_err) {
-        L<<Logger::Error<<"PKCS#11 operation " << operation << " failed: " << d_err << endl;
+        std::string msg = boost::str( boost::format("PKCS#11 operation %s failed: %s (0x%X)") % operation % p11_kit_strerror(d_err) % d_err );
+        L<<Logger::Error<< msg << endl;
       }
-    };
+    }
 
   public:
     Pkcs11Token(const boost::shared_ptr<Pkcs11Slot>& slot, const std::string& label); 
-- 
2.47.2