[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - RepositoryExternal.mk ucb/source

[David Tardon]

 RepositoryExternal.mk                      |    1 +
 ucb/source/ucp/webdav-neon/NeonSession.cxx |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 885858677b3e6d4c379837ca8305869e94e9f31a
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Aug 12 09:39:59 2013 +0200

    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 at redhat.com>
    
    Change-Id: I9b05883762273a9a48835b83725c98de1585d6d7
    Reviewed-on: https://gerrit.libreoffice.org/5360
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f4e3f1c..2f25029 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -833,6 +833,7 @@ ifeq ($(SYSTEM_NEON),YES)
 define gb_LinkTarget__use_neon
 $(call gb_LinkTarget_add_defs,$(1),\
 	-DNEON_VERSION=0x$(NEON_VERSION) \
+	-DSYSTEM_NEON \
 )
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 34a1937..cee643a 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.