Multi-line svn commit, see body.

[shibboleth/cpp-opensaml.git] / saml / binding / impl / NullSecurityRule.cpp

diff --git a/saml/binding/impl/NullSecurityRule.cpp b/saml/binding/impl/NullSecurityRule.cpp
index e861072..7d984ab 100644 (file)
--- a/saml/binding/impl/NullSecurityRule.cpp
+++ b/saml/binding/impl/NullSecurityRule.cpp
@@ -23,11 +23,11 @@
 #include "internal.h"
 #include "binding/SecurityPolicyRule.h"
 
-#include <log4cpp/Category.hh>
+#include <xmltooling/logging.h>
 
 using namespace opensaml;
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
 
 namespace opensaml {
@@ -37,7 +37,13 @@ namespace opensaml {
         NullSecurityRule(const DOMElement* e) : m_log(Category::getInstance(SAML_LOGCAT".SecurityPolicyRule.NullSecurity")) {}
         virtual ~NullSecurityRule() {}
         
-        void evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const;
+        const char* getType() const {
+            return NULLSECURITY_POLICY_RULE;
+        }
+        void evaluate(const XMLObject& message, const GenericRequest* request, const XMLCh* protocol, SecurityPolicy& policy) const {
+            m_log.warn("security enforced using NULL policy rule, be sure you know what you're doing");
+            policy.setSecure(true);
+        }
 
     private:
         Category& m_log;
@@ -48,9 +54,3 @@ namespace opensaml {
         return new NullSecurityRule(e);
     }
 };
-
-void NullSecurityRule::evaluate(const XMLObject& message, const GenericRequest* request, SecurityPolicy& policy) const
-{
-    m_log.warn("security enforced using NULL policy rule, be sure you know what you're doing");
-    policy.setSecure(true);
-}