[Cvs-nserver-commits] CVS: cvs-nserver/src racl.c,1.1.2.8,1.1.2.9 acl.c,1.1.2.18,1.1.2.19

[Alexey M. <ty...@us...>]

Update of /cvsroot/cvs-nserver/cvs-nserver/src
In directory usw-pr-cvs1:/tmp/cvs-serv28765

Modified Files:
      Tag: NCLI-1-11-1
	racl.c acl.c 
Log Message:
Fix as per new set_dir_ace()


Index: racl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/racl.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- racl.c	20 Jun 2002 17:46:46 -0000	1.1.2.8
+++ racl.c	23 Jun 2002 13:06:12 -0000	1.1.2.9
@@ -118,7 +118,7 @@
     };
     
     if (is_set_default_file_acl) {
-	/* BUG BUG BUG... We shouldn't check if resulting permission
+	/* FIXME: We shouldn't check if resulting permission
 	 * is exactly requested permission
 	 */
 	if ((set_default_file_acl(dir_acl, branch, (char*)username, branch_perm) != branch_perm)) {
@@ -135,8 +135,8 @@
 	if (dir_perm == dir_perm_invalid)
 	    goto out;
 	
-	/* BUG BUG BUG (the same as above. I should consult Alex */
-	if (set_dir_ace(dir_acl, username, dir_perm) != dir_perm) {
+	/* FIXME: (the same as above. I should consult Alex */
+	if (set_dir_ace(dir_acl, branch, username, dir_perm) != dir_perm) {
 	    error(0, 0, "Error setting '%s' permissions for '%s' on directory %s",
 		  dir_permissions_string(dir_perm), (char*)username, update_dir);
 	    error_counter++;

Index: acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/src/Attic/acl.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- acl.c	20 Jun 2002 17:24:22 -0000	1.1.2.18
+++ acl.c	23 Jun 2002 13:06:12 -0000	1.1.2.19
@@ -304,7 +304,7 @@
 	if (perm == dir_perm_invalid)
 	    error(1, 0, "Invalid directory permissions '%s'", perm_string);
 
-	if (set_dir_ace(dir_acl, username, perm) != perm)
+	if (set_dir_ace(dir_acl, branch, username, perm) != perm)
 	    error(1, 0, "Error setting %s permissions on directory %s",
 		  perm_string, relative_name);