summaryrefslogtreecommitdiff
path: root/qpid
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2009-03-16 21:21:54 +0000
committerStephen D. Huston <shuston@apache.org>2009-03-16 21:21:54 +0000
commit4a235ffeb36db975743e0dc64c5e7b41e0157d25 (patch)
treeabf65d49f8c7f50ddd51b47a2a4417e43b826ac5 /qpid
parentd58864360fa7c0a47f9d4686f35bac09c32e6ff5 (diff)
downloadqpid-python-4a235ffeb36db975743e0dc64c5e7b41e0157d25.tar.gz
Add PLAIN auth client handling for Windows; fixes QPID-1733
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@755008 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-rw-r--r--qpid/cpp/src/Makefile.am1
-rw-r--r--qpid/cpp/src/broker.vcproj2
-rw-r--r--qpid/cpp/src/client.vcproj8
-rw-r--r--qpid/cpp/src/common.vcproj2
-rw-r--r--qpid/cpp/src/qmfconsole.vcproj2
-rw-r--r--qpid/cpp/src/qpid.sln100
-rw-r--r--qpid/cpp/src/qpid/client/windows/SaslFactory.cpp139
-rw-r--r--qpid/cpp/src/qpidbroker.vcproj2
8 files changed, 198 insertions, 58 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index 45dcffc959..7de05645fa 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -29,6 +29,7 @@ windows_dist = \
client.vcproj \
qmfconsole.vcproj \
protocol_gen.mak \
+ qpid/client/windows/SaslFactory.cpp \
qpid/log/windows/SinkOptions.cpp \
qpid/log/windows/SinkOptions.h \
qpid/sys/windows/check.h \
diff --git a/qpid/cpp/src/broker.vcproj b/qpid/cpp/src/broker.vcproj
index db76720f38..e4911e0bfc 100644
--- a/qpid/cpp/src/broker.vcproj
+++ b/qpid/cpp/src/broker.vcproj
@@ -24,7 +24,7 @@
ProjectType="Visual C++"
Version="9.00"
Name="broker"
- ProjectGUID="{09613D48-FECA-1BAD-9D20-8C378F43FDD9}"
+ ProjectGUID="{09613D48-FECA-1BAD-9D20-8C374564ADCF}"
RootNamespace="broker"
Keyword="Win32Proj"
SignManifests="true"
diff --git a/qpid/cpp/src/client.vcproj b/qpid/cpp/src/client.vcproj
index 76f4e44a6c..28b7ec73dc 100644
--- a/qpid/cpp/src/client.vcproj
+++ b/qpid/cpp/src/client.vcproj
@@ -24,7 +24,7 @@
ProjectType="Visual C++"
Version="9.00"
Name="client"
- ProjectGUID="{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}"
+ ProjectGUID="{6961DBA3-FECA-1BAD-F396-8C394564ADCF}"
RootNamespace="client"
Keyword="Win32Proj"
SignManifests="true"
@@ -456,9 +456,6 @@
RelativePath="qpid\client\Results.cpp">
</File>
<File
- RelativePath="qpid\client\SaslFactory.cpp">
- </File>
- <File
RelativePath="qpid\client\SessionBase_0_10.cpp">
</File>
<File
@@ -482,6 +479,9 @@
<File
RelativePath="qpid\client\SubscriptionManager.cpp">
</File>
+ <File
+ RelativePath="qpid\client\windows\SaslFactory.cpp">
+ </File>
</Filter>
<Filter
Name="Header Files"
diff --git a/qpid/cpp/src/common.vcproj b/qpid/cpp/src/common.vcproj
index 5ab2dbafde..96d67b9d54 100644
--- a/qpid/cpp/src/common.vcproj
+++ b/qpid/cpp/src/common.vcproj
@@ -24,7 +24,7 @@
ProjectType="Visual C++"
Version="9.00"
Name="common"
- ProjectGUID="{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}"
+ ProjectGUID="{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"
RootNamespace="common"
Keyword="Win32Proj"
SignManifests="true"
diff --git a/qpid/cpp/src/qmfconsole.vcproj b/qpid/cpp/src/qmfconsole.vcproj
index 3227590c48..d2f79af64b 100644
--- a/qpid/cpp/src/qmfconsole.vcproj
+++ b/qpid/cpp/src/qmfconsole.vcproj
@@ -24,7 +24,7 @@
ProjectType="Visual C++"
Version="9.00"
Name="qmfconsole"
- ProjectGUID="{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}"
+ ProjectGUID="{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}"
RootNamespace="qmfconsole"
Keyword="Win32Proj"
SignManifests="true"
diff --git a/qpid/cpp/src/qpid.sln b/qpid/cpp/src/qpid.sln
index 46d09a2db6..c7004444f9 100644
--- a/qpid/cpp/src/qpid.sln
+++ b/qpid/cpp/src/qpid.sln
@@ -8,27 +8,27 @@ Microsoft Visual Studio Solution File, Format Version 10.00
#
# MPC Command:
# C:\ace\MPC\mwc.pl -type vc9 -features boost=1 qpid.mwc
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broker", "broker.vcproj", "{09613D48-FECA-1BAD-9D20-8C378F43FDD9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broker", "broker.vcproj", "{09613D48-FECA-1BAD-9D20-8C374564ADCF}"
ProjectSection(ProjectDependencies) = postProject
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9} = {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF} = {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcproj", "{6961DBA3-FECA-1BAD-F396-8C398F43FDD9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcproj", "{6961DBA3-FECA-1BAD-F396-8C394564ADCF}"
ProjectSection(ProjectDependencies) = postProject
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9} = {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF} = {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmfconsole", "qmfconsole.vcproj", "{C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmfconsole", "qmfconsole.vcproj", "{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}"
ProjectSection(ProjectDependencies) = postProject
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9} = {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF} = {6961DBA3-FECA-1BAD-F396-8C394564ADCF}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qpidbroker", "qpidbroker.vcproj", "{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qpidbroker", "qpidbroker.vcproj", "{66213D3E-FECA-1BAD-9D20-8C374564ADCF}"
ProjectSection(ProjectDependencies) = postProject
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9} = {09613D48-FECA-1BAD-9D20-8C378F43FDD9}
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9} = {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF} = {09613D48-FECA-1BAD-9D20-8C374564ADCF}
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF} = {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}
EndProjectSection
EndProject
Global
@@ -39,46 +39,46 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Debug|x64.Build.0 = Debug|x64
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Release|Win32.Build.0 = Release|Win32
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Release|x64.ActiveCfg = Release|x64
- {09613D48-FECA-1BAD-9D20-8C378F43FDD9}.Release|x64.Build.0 = Release|x64
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Debug|x64.Build.0 = Debug|x64
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Release|Win32.Build.0 = Release|Win32
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Release|x64.ActiveCfg = Release|x64
- {6961DBA3-FECA-1BAD-F396-8C398F43FDD9}.Release|x64.Build.0 = Release|x64
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Debug|x64.Build.0 = Debug|x64
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Release|Win32.Build.0 = Release|Win32
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Release|x64.ActiveCfg = Release|x64
- {C961EF23-FECA-1BAD-BB9C-8C3A8F43FDD9}.Release|x64.Build.0 = Release|x64
- {C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
- {C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
- {C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
- {C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Debug|x64.Build.0 = Debug|x64
- {C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
- {C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Release|Win32.Build.0 = Release|Win32
- {C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Release|x64.ActiveCfg = Release|x64
- {C95DE177-FECA-1BAD-5EDC-8FFA8F43FDD9}.Release|x64.Build.0 = Release|x64
- {66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Debug|Win32.ActiveCfg = Debug|Win32
- {66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Debug|Win32.Build.0 = Debug|Win32
- {66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Debug|x64.ActiveCfg = Debug|x64
- {66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Debug|x64.Build.0 = Debug|x64
- {66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Release|Win32.ActiveCfg = Release|Win32
- {66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Release|Win32.Build.0 = Release|Win32
- {66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Release|x64.ActiveCfg = Release|x64
- {66213D3E-FECA-1BAD-9D20-8C378F43FDD9}.Release|x64.Build.0 = Release|x64
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.Build.0 = Debug|Win32
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.ActiveCfg = Debug|x64
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.Build.0 = Debug|x64
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF}.Release|Win32.ActiveCfg = Release|Win32
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF}.Release|Win32.Build.0 = Release|Win32
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF}.Release|x64.ActiveCfg = Release|x64
+ {09613D48-FECA-1BAD-9D20-8C374564ADCF}.Release|x64.Build.0 = Release|x64
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Debug|Win32.Build.0 = Debug|Win32
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Debug|x64.ActiveCfg = Debug|x64
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Debug|x64.Build.0 = Debug|x64
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Release|Win32.ActiveCfg = Release|Win32
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Release|Win32.Build.0 = Release|Win32
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Release|x64.ActiveCfg = Release|x64
+ {6961DBA3-FECA-1BAD-F396-8C394564ADCF}.Release|x64.Build.0 = Release|x64
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.Build.0 = Debug|Win32
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.ActiveCfg = Debug|x64
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.Build.0 = Debug|x64
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.ActiveCfg = Release|Win32
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.Build.0 = Release|Win32
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.ActiveCfg = Release|x64
+ {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.Build.0 = Release|x64
+ {C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Debug|Win32.Build.0 = Debug|Win32
+ {C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Debug|x64.ActiveCfg = Debug|x64
+ {C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Debug|x64.Build.0 = Debug|x64
+ {C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Release|Win32.ActiveCfg = Release|Win32
+ {C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Release|Win32.Build.0 = Release|Win32
+ {C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Release|x64.ActiveCfg = Release|x64
+ {C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}.Release|x64.Build.0 = Release|x64
+ {66213D3E-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {66213D3E-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.Build.0 = Debug|Win32
+ {66213D3E-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.ActiveCfg = Debug|x64
+ {66213D3E-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.Build.0 = Debug|x64
+ {66213D3E-FECA-1BAD-9D20-8C374564ADCF}.Release|Win32.ActiveCfg = Release|Win32
+ {66213D3E-FECA-1BAD-9D20-8C374564ADCF}.Release|Win32.Build.0 = Release|Win32
+ {66213D3E-FECA-1BAD-9D20-8C374564ADCF}.Release|x64.ActiveCfg = Release|x64
+ {66213D3E-FECA-1BAD-9D20-8C374564ADCF}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
new file mode 100644
index 0000000000..58956609a4
--- /dev/null
+++ b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
@@ -0,0 +1,139 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "qpid/client/SaslFactory.h"
+#include "qpid/client/ConnectionSettings.h"
+
+#include "qpid/Exception.h"
+#include "qpid/framing/reply_exceptions.h"
+#include "qpid/sys/SecurityLayer.h"
+#include "qpid/log/Statement.h"
+
+#include "boost/tokenizer.hpp"
+
+namespace qpid {
+namespace client {
+
+using qpid::sys::SecurityLayer;
+using qpid::framing::InternalErrorException;
+
+class WindowsSasl : public Sasl
+{
+ public:
+ WindowsSasl(const ConnectionSettings&);
+ ~WindowsSasl();
+ std::string start(const std::string& mechanisms);
+ std::string step(const std::string& challenge);
+ std::string getMechanism();
+ std::auto_ptr<SecurityLayer> getSecurityLayer(uint16_t maxFrameSize);
+ private:
+ ConnectionSettings settings;
+ std::string mechanism;
+};
+
+qpid::sys::Mutex SaslFactory::lock;
+std::auto_ptr<SaslFactory> SaslFactory::instance;
+
+SaslFactory::SaslFactory()
+{
+}
+
+SaslFactory::~SaslFactory()
+{
+}
+
+SaslFactory& SaslFactory::getInstance()
+{
+ qpid::sys::Mutex::ScopedLock l(lock);
+ if (!instance.get()) {
+ instance = std::auto_ptr<SaslFactory>(new SaslFactory());
+ }
+ return *instance;
+}
+
+std::auto_ptr<Sasl> SaslFactory::create(const ConnectionSettings& settings)
+{
+ std::auto_ptr<Sasl> sasl(new WindowsSasl(settings));
+ return sasl;
+}
+
+namespace {
+ const std::string ANONYMOUS = "ANONYMOUS";
+ const std::string PLAIN = "PLAIN";
+}
+
+WindowsSasl::WindowsSasl(const ConnectionSettings& s)
+ : settings(s)
+{
+}
+
+WindowsSasl::~WindowsSasl()
+{
+}
+
+std::string WindowsSasl::start(const std::string& mechanisms)
+{
+ QPID_LOG(debug, "WindowsSasl::start(" << mechanisms << ")");
+
+ typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+ boost::char_separator<char> sep(" ");
+ bool havePlain = false;
+ bool haveAnon = false;
+ tokenizer mechs(mechanisms, sep);
+ for (tokenizer::iterator mech = mechs.begin();
+ mech != mechs.end();
+ ++mech) {
+ if (*mech == ANONYMOUS)
+ haveAnon = true;
+ else if (*mech == PLAIN)
+ havePlain = true;
+ }
+ if (!haveAnon && !havePlain)
+ throw InternalErrorException(QPID_MSG("Sasl error: no common mechanism"));
+
+ std::string resp = "";
+ if (havePlain) {
+ mechanism = PLAIN;
+ resp = ((char)0) + settings.username + ((char)0) + settings.password;
+ }
+ else {
+ mechanism = ANONYMOUS;
+ }
+ return resp;
+}
+
+std::string WindowsSasl::step(const std::string& challenge)
+{
+ // Shouldn't get this for PLAIN...
+ throw InternalErrorException(QPID_MSG("Sasl step error"));
+}
+
+std::string WindowsSasl::getMechanism()
+{
+ return mechanism;
+}
+
+std::auto_ptr<SecurityLayer> WindowsSasl::getSecurityLayer(uint16_t maxFrameSize)
+{
+ return std::auto_ptr<SecurityLayer>(0);
+}
+
+}} // namespace qpid::client
diff --git a/qpid/cpp/src/qpidbroker.vcproj b/qpid/cpp/src/qpidbroker.vcproj
index 2d2c35051e..c56970edaa 100644
--- a/qpid/cpp/src/qpidbroker.vcproj
+++ b/qpid/cpp/src/qpidbroker.vcproj
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="9.00"
Name="qpidbroker"
- ProjectGUID="{66213D3E-FECA-1BAD-9D20-8C378F43FDD9}"
+ ProjectGUID="{66213D3E-FECA-1BAD-9D20-8C374564ADCF}"
RootNamespace="qpidbroker"
Keyword="Win32Proj"
SignManifests="true"