Author: rhuijben
Date: Wed Sep 21 14:42:56 2016
New Revision: 1761755
URL: http://svn.apache.org/viewvc?rev=1761755&view=rev
Log:
Make sure two DARWIN specific deprecated functions don't try to access
the keychain library when a user explicitly disabled keychain support
by passing --disable-keychain to configure.
Note that we can't just undefine these functions as that would break
our ABI.
* subversion/libsvn_subr/deprecated.c
(svn_auth_get_keychain_simple_provider,
svn_auth_get_keychain_ssl_client_cert_pw_provider):
Return a dummy provider when SVN_HAVE_KEYCHAIN_SERVICES is not
defined.
Modified:
subversion/trunk/subversion/libsvn_subr/deprecated.c
Modified: subversion/trunk/subversion/libsvn_subr/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/deprecated.c?rev=1761755&r1=1761754&r2=1761755&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_subr/deprecated.c Wed Sep 21 14:42:56
2016
@@ -1521,7 +1521,11 @@ void
svn_auth_get_keychain_simple_provider(svn_auth_provider_object_t **provider,
apr_pool_t *pool)
{
+#ifdef SVN_HAVE_KEYCHAIN_SERVICES
svn_auth__get_keychain_simple_provider(provider, pool);
+#else
+ svn_auth__get_dummmy_simple_provider(provider, pool);
+#endif
}
void
@@ -1529,7 +1533,13 @@ svn_auth_get_keychain_ssl_client_cert_pw
(svn_auth_provider_object_t **provider,
apr_pool_t *pool)
{
+#ifdef SVN_HAVE_KEYCHAIN_SERVICES
svn_auth__get_keychain_ssl_client_cert_pw_provider(provider, pool);
+#else
+ /* Not really the right type of dummy provider, but doesn't throw NULL
+ errors as just returning NULL would */
+ svn_auth__get_dummmy_simple_provider(provider, pool);
+#endif
}
#endif /* DARWIN */
