subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1400756 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_repos/authz.c
Date Mon, 22 Oct 2012 04:03:33 GMT
Author: svn-role
Date: Mon Oct 22 04:03:32 2012
New Revision: 1400756

URL: http://svn.apache.org/viewvc?rev=1400756&view=rev
Log:
Merge r1394519 from trunk:

 * r1394519
   Fix issue #3531 ("Error with AuthzSVNAccessFile groups parsing in
   mod_authz_svn").
   Justification:
     This bug prevents users from defining access rules for certain
     repositories, resulting in some cases in access being forbidden
     to those repositories.
   Votes:
     +1: cmpilato, danielsh, breser

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_repos/authz.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1394519

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1400756&r1=1400755&r2=1400756&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Mon Oct 22 04:03:32 2012
@@ -76,16 +76,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1394519
-   Fix issue #3531 ("Error with AuthzSVNAccessFile groups parsing in
-   mod_authz_svn").
-   Justification:
-     This bug prevents users from defining access rules for certain
-     repositories, resulting in some cases in access being forbidden
-     to those repositories.
-   Votes:
-     +1: cmpilato, danielsh, breser
-
  * r1390653
    Add Vary: header to GET response.
    Justification:

Modified: subversion/branches/1.7.x/subversion/libsvn_repos/authz.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_repos/authz.c?rev=1400756&r1=1400755&r2=1400756&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_repos/authz.c Mon Oct 22 04:03:32 2012
@@ -714,14 +714,15 @@ static svn_boolean_t authz_validate_sect
 {
   struct authz_validate_baton *b = baton;
 
-  /* If the section is the groups definition, use the group checking
-     callback. Otherwise, use the rule checking callback. */
-  if (strncmp(name, "groups", 6) == 0)
+  /* Use the group checking callback for the "groups" section... */
+  if (strcmp(name, "groups") == 0)
     svn_config_enumerate2(b->config, name, authz_validate_group,
                           baton, pool);
-  else if (strncmp(name, "aliases", 7) == 0)
+  /* ...and the alias checking callback for "aliases"... */
+  else if (strcmp(name, "aliases") == 0)
     svn_config_enumerate2(b->config, name, authz_validate_alias,
                           baton, pool);
+  /* ...but for everything else use the rule checking callback. */
   else
     svn_config_enumerate2(b->config, name, authz_validate_rule,
                           baton, pool);



Mime
View raw message