diff options
| author | David Tardon <dtardon@redhat.com> | 2013-08-12 09:39:59 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-08-12 10:58:52 +0000 |
| commit | 885858677b3e6d4c379837ca8305869e94e9f31a (patch) | |
| tree | 1e6f16f0d1283b9d377ea3dace998151e49d45e1 /ucb | |
| parent | b93ad36d89b16890ba213c9e5e44973591a2d65c (diff) | |
only use the SSPI support with internal neon
neon 0.30.0 has added support for SSPI (author of the commit is kso,
which sounds familiar :-), so NE_FEATURE_SSPI is defined, but the
signature of ne_auth_creds remains the same as before. That means that
build with system neon 0.30.0 fails...
(cherry picked from commit b74bf4146e866fbcd41ad075296c9a4eee16c829)
Signed-off-by: David Tardon <dtardon@redhat.com>
Change-Id: I9b05883762273a9a48835b83725c98de1585d6d7
Reviewed-on: https://gerrit.libreoffice.org/5360
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 34a193732d5e..cee643a587dc 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -228,7 +228,7 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData, } extern "C" int NeonSession_NeonAuth( void * inUserData, -#ifdef NE_FEATURE_SSPI +#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON const char * inAuthProtocol, #endif const char * inRealm, @@ -297,7 +297,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, bool bCanUseSystemCreds = false; -#ifdef NE_FEATURE_SSPI +#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON bCanUseSystemCreds = (attempt == 0) && // avoid endless loops ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. |