You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2013/06/25 19:18:39 UTC
svn commit: r1496545 - in /qpid/trunk/qpid/cpp/src/qpid/broker:
ConnectionHandler.cpp amqp/Authorise.h windows/SaslAuthenticator.cpp
Author: gsim
Date: Tue Jun 25 17:18:38 2013
New Revision: 1496545
URL: http://svn.apache.org/r1496545
Log:
QPID-4712: fixes for windows, rhel5
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Authorise.h
qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp?rev=1496545&r1=1496544&r2=1496545&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp Tue Jun 25 17:18:38 2013
@@ -109,10 +109,10 @@ void ConnectionHandler::setSecureConnect
handler->secured = secured;
}
-ConnectionHandler::ConnectionHandler(amqp_0_10::Connection& connection, bool isClient) :
+ConnectionHandler::ConnectionHandler(qpid::broker::amqp_0_10::Connection& connection, bool isClient) :
handler(new Handler(connection, isClient)) {}
-ConnectionHandler::Handler::Handler(amqp_0_10::Connection& c, bool isClient) :
+ConnectionHandler::Handler::Handler(qpid::broker::amqp_0_10::Connection& c, bool isClient) :
proxy(c.getOutput()),
connection(c), serverMode(!isClient), secured(0),
isOpen(false)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Authorise.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Authorise.h?rev=1496545&r1=1496544&r2=1496545&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Authorise.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Authorise.h Tue Jun 25 17:18:38 2013
@@ -21,6 +21,7 @@
* under the License.
*
*/
+#include <string>
#include <boost/shared_ptr.hpp>
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp?rev=1496545&r1=1496544&r2=1496545&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp Tue Jun 25 17:18:38 2013
@@ -22,7 +22,7 @@
// This source is only used on Windows; SSPI is the Windows mechanism for
// accessing authentication mechanisms, analogous to Cyrus SASL.
-#include "qpid/broker/Connection.h"
+#include "qpid/broker/amqp_0_10/Connection.h"
#include "qpid/broker/Broker.h"
#include "qpid/log/Statement.h"
#include "qpid/framing/reply_exceptions.h"
@@ -41,10 +41,10 @@ namespace broker {
class NullAuthenticator : public SaslAuthenticator
{
- Connection& connection;
+ qpid::broker::amqp_0_10::Connection& connection;
framing::AMQP_ClientProxy::Connection client;
public:
- NullAuthenticator(Connection& connection);
+ NullAuthenticator(qpid::broker::amqp_0_10::Connection& connection);
~NullAuthenticator();
void getMechanisms(framing::Array& mechanisms);
void start(const std::string& mechanism, const std::string* response);
@@ -55,11 +55,11 @@ public:
class SspiAuthenticator : public SaslAuthenticator
{
HANDLE userToken;
- Connection& connection;
+ qpid::broker::amqp_0_10::Connection& connection;
framing::AMQP_ClientProxy::Connection client;
public:
- SspiAuthenticator(Connection& connection);
+ SspiAuthenticator(qpid::broker::amqp_0_10::Connection& connection);
~SspiAuthenticator();
void getMechanisms(framing::Array& mechanisms);
void start(const std::string& mechanism, const std::string* response);
@@ -83,7 +83,7 @@ void SaslAuthenticator::fini(void)
return;
}
-std::auto_ptr<SaslAuthenticator> SaslAuthenticator::createAuthenticator(Connection& c)
+std::auto_ptr<SaslAuthenticator> SaslAuthenticator::createAuthenticator(qpid::broker::amqp_0_10::Connection& c)
{
if (c.getBroker().getOptions().auth) {
return std::auto_ptr<SaslAuthenticator>(new SspiAuthenticator(c));
@@ -92,7 +92,7 @@ std::auto_ptr<SaslAuthenticator> SaslAut
}
}
-NullAuthenticator::NullAuthenticator(Connection& c) : connection(c), client(c.getOutput()) {}
+NullAuthenticator::NullAuthenticator(qpid::broker::amqp_0_10::Connection& c) : connection(c), client(c.getOutput()) {}
NullAuthenticator::~NullAuthenticator() {}
void NullAuthenticator::getMechanisms(Array& mechanisms)
@@ -125,7 +125,7 @@ std::auto_ptr<SecurityLayer> NullAuthent
}
-SspiAuthenticator::SspiAuthenticator(Connection& c) : userToken(INVALID_HANDLE_VALUE), connection(c), client(c.getOutput())
+SspiAuthenticator::SspiAuthenticator(qpid::broker::amqp_0_10::Connection& c) : userToken(INVALID_HANDLE_VALUE), connection(c), client(c.getOutput())
{
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org