===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/Attic/conf.y,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/cvs/Attic/conf.y	2004/09/27 12:39:29	1.3
--- src/usr.bin/cvs/Attic/conf.y	2004/11/26 16:23:50	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: conf.y,v 1.3 2004/09/27 12:39:29 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved. 
--- 1,4 ----
! /*	$OpenBSD: conf.y,v 1.4 2004/11/26 16:23:50 jfb Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved. 
***************
*** 640,645 ****
--- 640,646 ----
  cvs_acl_eval(struct cvs_op *op)
  {
  	u_int res;
+ 	char fpath[MAXPATHLEN];
  	CVSFILE *cf;
  	struct acl_rule *rule;
  
***************
*** 653,661 ****
  			continue;
  
  		/* see if one of the files has a matching path */
! 		TAILQ_FOREACH(cf, &(op->co_files), cf_list)
! 			if (!cvs_acl_matchpath(cf->cf_path, rule->ar_path))
  				continue;
  
  		res = rule->ar_act;
  
--- 654,664 ----
  			continue;
  
  		/* see if one of the files has a matching path */
! 		TAILQ_FOREACH(cf, &(op->co_files), cf_list) {
! 			/* XXX borked */
! 			if (!cvs_acl_matchpath(fpath, rule->ar_path))
  				continue;
+ 		}
  
  		res = rule->ar_act;