[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r22825 - in trunk/subversion: libsvn_repos tests/cmdline

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-12-29 01:27:23 CET

If this is applicable to 1.4.x, shouldn't it be backported?

On Thu, 28 Dec 2006, malcolm@tigris.org wrote:

> Author: malcolm
> Date: Thu Dec 28 05:08:35 2006
> New Revision: 22825
>
> Log:
> Fix issue 2684: When checking authz validity, don't report a circular
> dependency if a group is used by more than one other group. (That is,
> we're checking to make sure there are no cycles, not checking for a tree
> structure; DAGs are okay).
>
> * subversion/libsvn_repos/authz.c
> (authz_group_walk): Forget that we've encountered a group once we've
> walked it, so that we can encounter it again without error.
>
> * subversion/tests/cmdline/authz_tests.py
> (test_list): Unmark authz_validate as XFail.
>
>
> Modified:
> trunk/subversion/libsvn_repos/authz.c
> trunk/subversion/tests/cmdline/authz_tests.py
>
> Modified: trunk/subversion/libsvn_repos/authz.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_repos/authz.c?pathrev=22825&r1=22824&r2=22825
> ==============================================================================
> --- trunk/subversion/libsvn_repos/authz.c (original)
> +++ trunk/subversion/libsvn_repos/authz.c Thu Dec 28 05:08:35 2006
> @@ -464,6 +464,12 @@
> /* Recurse on that group. */
> SVN_ERR(authz_group_walk(cfg, &group_user[1],
> checked_groups, pool));
> +
> + /* Remove group from hash of checked groups, so that we don't
> + incorrectly report an error if we see it again as part of
> + another group. */
> + apr_hash_set(checked_groups, &group_user[1],
> + APR_HASH_KEY_STRING, NULL);
> }
> else if (*group_user == '&')
> {
>
> Modified: trunk/subversion/tests/cmdline/authz_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/authz_tests.py?pathrev=22825&r1=22824&r2=22825
> ==============================================================================
> --- trunk/subversion/tests/cmdline/authz_tests.py (original)
> +++ trunk/subversion/tests/cmdline/authz_tests.py Thu Dec 28 05:08:35 2006
> @@ -805,7 +805,7 @@
> authz_checkout_and_update_test,
> authz_partial_export_test,
> authz_aliases,
> - XFail(authz_validate)
> + authz_validate,
> ]
>
> if __name__ == '__main__':
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org

  • application/pgp-signature attachment: stored
Received on Fri Dec 29 01:29:16 2006

This is an archived mail posted to the Subversion Dev mailing list.