diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Broker.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/SaslAuthenticator.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/client/SslConnector.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/sys/SslPlugin.cpp | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 663a110a78..e4c5c9b5e9 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -237,6 +237,8 @@ Broker::Broker(const Broker::Options& conf) : if (conf.auth) { SaslAuthenticator::init(qpid::saslName); QPID_LOG(info, "SASL enabled"); + } else { + QPID_LOG(notice, "SASL disabled: No Authentication Performed"); } // Initialize plugins diff --git a/cpp/src/qpid/broker/SaslAuthenticator.cpp b/cpp/src/qpid/broker/SaslAuthenticator.cpp index 57c761a41d..736b051945 100644 --- a/cpp/src/qpid/broker/SaslAuthenticator.cpp +++ b/cpp/src/qpid/broker/SaslAuthenticator.cpp @@ -128,7 +128,7 @@ std::auto_ptr<SaslAuthenticator> SaslAuthenticator::createAuthenticator(Connecti if (c.getBroker().getOptions().auth) { return std::auto_ptr<SaslAuthenticator>(new CyrusAuthenticator(c, c.getBroker().getOptions().requireEncrypted)); } else { - QPID_LOG(warning, "SASL: No Authentication Performed"); + QPID_LOG(debug, "SASL: No Authentication Performed"); needWarning = false; return std::auto_ptr<SaslAuthenticator>(new NullAuthenticator(c)); } diff --git a/cpp/src/qpid/client/SslConnector.cpp b/cpp/src/qpid/client/SslConnector.cpp index a68af78354..75c3f5677e 100644 --- a/cpp/src/qpid/client/SslConnector.cpp +++ b/cpp/src/qpid/client/SslConnector.cpp @@ -148,7 +148,7 @@ namespace { SslOptions options; options.parse (0, 0, CONF_FILE, true); if (options.certDbPath.empty()) { - QPID_LOG(warning, "SSL connector not enabled, you must set QPID_SSL_CERT_DB to enable it."); + QPID_LOG(info, "SSL connector not enabled, you must set QPID_SSL_CERT_DB to enable it."); } else { initNSS(options); Connector::registerFactory("ssl", &create); diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/cpp/src/qpid/sys/SslPlugin.cpp index 14052c2ee4..203aa9a1d7 100644 --- a/cpp/src/qpid/sys/SslPlugin.cpp +++ b/cpp/src/qpid/sys/SslPlugin.cpp @@ -90,7 +90,7 @@ static struct SslPlugin : public Plugin { // Only provide to a Broker if (broker) { if (options.certDbPath.empty()) { - QPID_LOG(warning, "SSL plugin not enabled, you must set --qpid-ssl-cert-db to enable it."); + QPID_LOG(info, "SSL plugin not enabled, you must set --qpid-ssl-cert-db to enable it."); } else { try { ssl::initNSS(options, true); |