Author: stsp Date: Mon Jul 25 23:25:39 2011 New Revision: 1150954 URL: http://svn.apache.org/viewvc?rev=1150954&view=rev Log: Move gpg-agent behind GNOME Keyring, Kwallet, and Keychain, by default. We don't want to disturb existing setups that use existing password caching mechanisms on *NIX systems.
* subversion/include/svn_auth.h (svn_auth_get_platform_specific_provider): Document the new default order. * subversion/libsvn_subr/auth.c (svn_auth_get_platform_specific_client_providers): Add a new macro SVN__DEFAULT_AUTH_PROVIDER_LIST that expands to the default list of auth providers (previously the list was listed twice). Change the list to reflect the priority order described above. Modified: subversion/trunk/subversion/include/svn_auth.h subversion/trunk/subversion/libsvn_subr/auth.c Modified: subversion/trunk/subversion/include/svn_auth.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_auth.h?rev=1150954&r1=1150953&r2=1150954&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_auth.h (original) +++ subversion/trunk/subversion/include/svn_auth.h Mon Jul 25 23:25:39 2011 @@ -818,9 +818,9 @@ svn_auth_get_platform_specific_provider( * * Default order of the platform-specific authentication providers: * 1. gnome-keyring - * 2. gpg-agent - * 3. kwallet - * 4. keychain + * 2. kwallet + * 3. keychain + * 4. gpg-agent * 5. windows-cryptoapi * * @since New in 1.6. Modified: subversion/trunk/subversion/libsvn_subr/auth.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/auth.c?rev=1150954&r1=1150953&r2=1150954&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/auth.c (original) +++ subversion/trunk/subversion/libsvn_subr/auth.c Mon Jul 25 23:25:39 2011 @@ -500,6 +500,9 @@ svn_auth_get_platform_specific_client_pr apr_array_header_t *password_stores; int i; +#define SVN__DEFAULT_AUTH_PROVIDER_LIST \ + "gnome-keyring,kwallet,keychain,gpg-agent,windows-cryptoapi" + if (config) { svn_config_get @@ -507,12 +510,11 @@ svn_auth_get_platform_specific_client_pr &password_stores_config_option, SVN_CONFIG_SECTION_AUTH, SVN_CONFIG_OPTION_PASSWORD_STORES, - "gpg-agent,gnome-keyring,kwallet,keychain,windows-cryptoapi"); + SVN__DEFAULT_AUTH_PROVIDER_LIST); } else { - password_stores_config_option = - "gpg-agent,gnome-keyring,kwallet,keychain,windows-cryptoapi"; + password_stores_config_option = SVN__DEFAULT_AUTH_PROVIDER_LIST; } *providers = apr_array_make(pool, 12, sizeof(svn_auth_provider_object_t *));