[Xfce4-commits] Updated the auth providers.

[Peter de Ridder]

Updating branch refs/heads/master
         to bb229a434f76b35192b8f30592d6563fc6ab6393 (commit)
       from a57e7407566c83c25ab379a6c84d832ecd83940a (commit)

commit bb229a434f76b35192b8f30592d6563fc6ab6393
Author: Peter de Ridder <pe...@xfce.org>
Date:   Mon Jan 18 23:56:02 2010 +0100

    Updated the auth providers.
    
    Changed the auth provider routines to those of svn 1.6.

 tvp-svn-helper/tsh-common.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/tvp-svn-helper/tsh-common.c b/tvp-svn-helper/tsh-common.c
index 0918555..eaa0a9e 100644
--- a/tvp-svn-helper/tsh-common.c
+++ b/tvp-svn-helper/tsh-common.c
@@ -157,6 +157,7 @@ gboolean tsh_create_context (svn_client_ctx_t **pctx, 
apr_pool_t *pool, svn_erro
        /* Set cancel funvtion */
        ctx->cancel_func = tsh_check_cancel;
 
+#if CHECK_SVN_VERSION(1,5)
        /* Create an array to hold the providers */
        providers = apr_array_make (pool, 12, sizeof 
(svn_auth_provider_object_t *));
 
@@ -169,6 +170,12 @@ gboolean tsh_create_context (svn_client_ctx_t **pctx, 
apr_pool_t *pool, svn_erro
        svn_auth_get_keychain_simple_provider (&provider, pool);
        APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
 #endif
+#else /* CHECK_SVN_VERSION(1,6)*/
+  /* Create an array to hold the providers */
+  svn_auth_get_platform_specific_client_providers (&providers, cfg, pool);
+#endif
+
+  /* Disk caching auth providers */
 #if CHECK_SVN_VERSION(1,5)
        svn_auth_get_simple_provider (&provider, pool);
 #else /* CHECK_SVN_VERSION(1,6)*/
@@ -179,6 +186,16 @@ gboolean tsh_create_context (svn_client_ctx_t **pctx, 
apr_pool_t *pool, svn_erro
        APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
 
        /* Cert auth providers */
+#if CHECK_SVN_VERSION(1,5)
+#ifdef G_OS_WIN32
+  svn_auth_get_windows_ssl_server_trust_provider (&provider, pool);
+  APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
+#endif
+#else /* CHECK_SVN_VERSION(1,6)*/
+  svn_auth_get_platform_specific_provider (&provider, "windows", 
"ssl_server_trust", pool);
+  if (provider)
+    APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
+#endif
        svn_auth_get_ssl_server_trust_file_provider (&provider, pool);
        APR_ARRAY_PUSH (providers, svn_auth_provider_object_t *) = provider;
        svn_auth_get_ssl_client_cert_file_provider (&provider, pool);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits