Swiftdiff options
| author | Mili Verma <mili.verma@isode.com> | 2015-07-08 15:27:52 (GMT) |
|---|---|---|
| committer | Mili Verma <mili.verma@isode.com> | 2015-07-08 15:33:09 (GMT) |
| commit | 58bb58557368c520e8a9368fcacff8d22466e759 (patch) | |
| tree | bfd8bb3b93ab771482fe46e1d558f4ad399bdaa1 /Swiften/Client/ClientOptions.h | |
| parent | 0e6beadc1b4427e8ab5109e52872f99a5f85c3d8 (diff) | |
| download | swift-58bb58557368c520e8a9368fcacff8d22466e759.zip swift-58bb58557368c520e8a9368fcacff8d22466e759.tar.bz2 | |
Use GSSAPI when SSO is used
This patch uses the GSSAPI authenticator on Windows if the server advertises it
and the client requests it. (The user is not able to request it in the UI yet)
Also sends the manual port to the GSSAPI authenticator to construct the SPN if
a non-default port is used.
Test-information:
Tested on Windows using WIP code. Tested both on TLS & without.
Unit tests pass.
Change-Id: I9a9ad9604fe084d5fb2003b7a91174a9512e2eec
Diffstat (limited to 'Swiften/Client/ClientOptions.h')
| -rw-r--r-- | Swiften/Client/ClientOptions.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Swiften/Client/ClientOptions.h b/Swiften/Client/ClientOptions.h index 25393e4..c09b987 100644 --- a/Swiften/Client/ClientOptions.h +++ b/Swiften/Client/ClientOptions.h | |||
| @@ -36,10 +36,11 @@ namespace Swift { | |||
| 36 | useTLS(UseTLSWhenAvailable), | 36 | useTLS(UseTLSWhenAvailable), |
| 37 | allowPLAINWithoutTLS(false), | 37 | allowPLAINWithoutTLS(false), |
| 38 | useStreamResumption(false), | 38 | useStreamResumption(false), |
| 39 | forgetPassword(false), | 39 | forgetPassword(false), |
| 40 | useAcks(true), | 40 | useAcks(true), |
| 41 | singleSignOn(false), | ||
| 41 | manualHostname(""), | 42 | manualHostname(""), |
| 42 | manualPort(-1), | 43 | manualPort(-1), |
| 43 | proxyType(SystemConfiguredProxy), | 44 | proxyType(SystemConfiguredProxy), |
| 44 | manualProxyHostname(""), | 45 | manualProxyHostname(""), |
| 45 | manualProxyPort(-1), | 46 | manualProxyPort(-1), |
| @@ -91,10 +92,16 @@ namespace Swift { | |||
| 91 | * Default: true | 92 | * Default: true |
| 92 | */ | 93 | */ |
| 93 | bool useAcks; | 94 | bool useAcks; |
| 94 | 95 | ||
| 95 | /** | 96 | /** |
| 97 | * Use Single Sign On. | ||
| 98 | * Default: false | ||
| 99 | */ | ||
| 100 | bool singleSignOn; | ||
| 101 | |||
| 102 | /** | ||
| 96 | * The hostname to connect to. | 103 | * The hostname to connect to. |
| 97 | * Leave this empty for standard XMPP connection, based on the JID domain. | 104 | * Leave this empty for standard XMPP connection, based on the JID domain. |
| 98 | */ | 105 | */ |
| 99 | std::string manualHostname; | 106 | std::string manualHostname; |
| 100 | 107 | ||