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 2013/10/07 00:36:50 UTC
svn commit: r1529708 - in /subversion/trunk/subversion/svnserve:
cyrus_auth.c serve.c
Author: stefan2
Date: Sun Oct 6 22:36:50 2013
New Revision: 1529708
URL: http://svn.apache.org/r1529708
Log:
Follow-up to r1529676: Update SASL-related code as well.
* subversion/svnserve/cyrus_auth.c
(cyrus_auth_request): adapt to recent server baton change
* subversion/svnserve/serve.c
(auth_request): ditto
Modified:
subversion/trunk/subversion/svnserve/cyrus_auth.c
subversion/trunk/subversion/svnserve/serve.c
Modified: subversion/trunk/subversion/svnserve/cyrus_auth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/cyrus_auth.c?rev=1529708&r1=1529707&r2=1529708&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/cyrus_auth.c (original)
+++ subversion/trunk/subversion/svnserve/cyrus_auth.c Sun Oct 6 22:36:50 2013
@@ -265,7 +265,7 @@ svn_error_t *cyrus_auth_request(svn_ra_s
/* Create a SASL context. SASL_SUCCESS_DATA tells SASL that the protocol
supports sending data along with the final "success" message. */
result = sasl_server_new(SVN_RA_SVN_SASL_NAME,
- hostname, b->realm,
+ hostname, b->repository->realm,
localaddrport, remoteaddrport,
NULL, SASL_SUCCESS_DATA,
&sasl_ctx);
@@ -289,13 +289,13 @@ svn_error_t *cyrus_auth_request(svn_ra_s
if (no_anonymous)
secprops.security_flags |= SASL_SEC_NOANONYMOUS;
- svn_config_get(b->cfg, &val,
+ svn_config_get(b->repository->cfg, &val,
SVN_CONFIG_SECTION_SASL,
SVN_CONFIG_OPTION_MIN_SSF,
"0");
SVN_ERR(svn_cstring_atoui(&secprops.min_ssf, val));
- svn_config_get(b->cfg, &val,
+ svn_config_get(b->repository->cfg, &val,
SVN_CONFIG_SECTION_SASL,
SVN_CONFIG_OPTION_MAX_SSF,
"256");
@@ -330,7 +330,7 @@ svn_error_t *cyrus_auth_request(svn_ra_s
/* Send the list of mechanisms and the realm to the client. */
SVN_ERR(svn_ra_svn__write_cmd_response(conn, pool, "(w)c",
- mechlist, b->realm));
+ mechlist, b->repository->realm));
/* The main authentication loop. */
subpool = svn_pool_create(pool);
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1529708&r1=1529707&r2=1529708&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Sun Oct 6 22:36:50 2013
@@ -741,7 +741,7 @@ static svn_error_t *auth_request(svn_ra_
svn_boolean_t needs_username)
{
#ifdef SVN_HAVE_SASL
- if (b->use_sasl)
+ if (b->repository->use_sasl)
return cyrus_auth_request(conn, pool, b, required, needs_username);
#endif