You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/07/25 20:36:17 UTC
svn commit: r1150833 - in /subversion/trunk/subversion: include/svn_auth.h
libsvn_subr/config_file.c
Author: stsp
Date: Mon Jul 25 18:36:16 2011
New Revision: 1150833
URL: http://svn.apache.org/viewvc?rev=1150833&view=rev
Log:
Small cleanups related to the new gpg-agent feature. No functional change.
* subversion/include/svn_auth.h
(svn_auth_get_platform_specific_provider,
svn_auth_get_platform_specific_client_providers): Mention gpg-agent
in docstrings.
* subversion/libsvn_subr/config_file.c
(svn_config_ensure): gpg-agent has not been tested on all platforms,
and we don't compile it on windows. So put it into the "Unix-like systems"
group instead of claiming it ran on all platforms.
Also remove it from the example line that enables keychain on Mac OS X.
Most Mac users probably prefer keychain and those that don't will be
smart enough to configure gpg-agent anyway.
Modified:
subversion/trunk/subversion/include/svn_auth.h
subversion/trunk/subversion/libsvn_subr/config_file.c
Modified: subversion/trunk/subversion/include/svn_auth.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_auth.h?rev=1150833&r1=1150832&r2=1150833&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_auth.h (original)
+++ subversion/trunk/subversion/include/svn_auth.h Mon Jul 25 18:36:16 2011
@@ -785,8 +785,8 @@ svn_auth_get_simple_provider(svn_auth_pr
* svn_auth_provider_object_t, or return @c NULL if the provider is not
* available for the requested platform or the requested provider is unknown.
*
- * Valid @a provider_name values are: "gnome_keyring", "keychain", "kwallet"
- * and "windows".
+ * Valid @a provider_name values are: "gnome_keyring", "keychain", "kwallet",
+ * "gpg_agent", and "windows".
*
* Valid @a provider_type values are: "simple", "ssl_client_cert_pw" and
* "ssl_server_trust".
@@ -818,9 +818,10 @@ svn_auth_get_platform_specific_provider(
*
* Default order of the platform-specific authentication providers:
* 1. gnome-keyring
- * 2. kwallet
- * 3. keychain
- * 4. windows-cryptoapi
+ * 2. gpg-agent
+ * 3. kwallet
+ * 4. keychain
+ * 5. windows-cryptoapi
*
* @since New in 1.6.
*/
Modified: subversion/trunk/subversion/libsvn_subr/config_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_file.c?rev=1150833&r1=1150832&r2=1150833&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config_file.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config_file.c Mon Jul 25 18:36:16 2011
@@ -954,11 +954,11 @@ svn_config_ensure(const char *config_dir
"### Valid password stores:" NL
"### gnome-keyring (Unix-like systems)" NL
"### kwallet (Unix-like systems)" NL
+ "### gpg-agent (Unix-like systems)" NL
"### keychain (Mac OS X)" NL
"### windows-cryptoapi (Windows)" NL
- "### gpg-agent (All platforms)" NL
#ifdef SVN_HAVE_KEYCHAIN_SERVICES
- "# password-stores = keychain,gpg-agent" NL
+ "# password-stores = keychain" NL
#elif defined(WIN32) && !defined(__MINGW32__)
"# password-stores = windows-cryptoapi" NL
#else