2 files changed, 5 insertions, 2 deletions
diff --git a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
index 7423243..f602bff 100644
--- a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
+++ b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
@@ -11,15 +11,18 @@
 #include <Swiften/SASL/WindowsServicePrincipalName.h>
 
 #define SECURITY_LAYER_NONE 1
 
 namespace Swift {
 
-WindowsGSSAPIClientAuthenticator::WindowsGSSAPIClientAuthenticator(const std::string& hostname, const std::string& domainname) : ClientAuthenticator("GSSAPI"), step_(BuildingSecurityContext), error_(false), haveCredentialsHandle_(false), haveContextHandle_(false), haveCompleteContext_(false) {
+WindowsGSSAPIClientAuthenticator::WindowsGSSAPIClientAuthenticator(const std::string& hostname, const std::string& domainname, int port) : ClientAuthenticator("GSSAPI"), step_(BuildingSecurityContext), error_(false), haveCredentialsHandle_(false), haveContextHandle_(false), haveCompleteContext_(false) {
 	WindowsServicePrincipalName servicePrincipalName(domainname);
 	servicePrincipalName.setInstanceName(hostname);
+	if ((port != -1) && (port != 5222)) {
+		servicePrincipalName.setInstancePort(port);
+	}
 	servicePrincipalNameString_ = servicePrincipalName.toString();
 
 	errorCode_ = acquireCredentialsHandle(&credentialsHandle_);
 	if (isError()) {
 		return;
 	}
diff --git a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.h b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.h
index d046999..f772b71 100644
--- a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.h
+++ b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.h
@@ -17,13 +17,13 @@
 #include <Swiften/Base/SafeByteArray.h>
 #include <Swiften/SASL/ClientAuthenticator.h>
 
 namespace Swift {
 	class SWIFTEN_API WindowsGSSAPIClientAuthenticator : public ClientAuthenticator {
 		public:
-			WindowsGSSAPIClientAuthenticator(const std::string& hostname, const std::string& domainname);
+			WindowsGSSAPIClientAuthenticator(const std::string& hostname, const std::string& domainname, int port);
 
 			~WindowsGSSAPIClientAuthenticator();
 
 			virtual boost::optional<SafeByteArray> getResponse() const;
 			virtual bool setChallenge(const boost::optional<std::vector<unsigned char> >&);