Update of /cvsroot/cvs-nserver/cvs-nserver/acl
In directory usw-pr-cvs1:/tmp/cvs-serv28091
Modified Files:
Tag: NCLI-1-11-1
check_dir_acl.c check_traversing.c
Log Message:
Fix as per new set_dir_ace()
Index: check_dir_acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_dir_acl.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- check_dir_acl.c 9 Jun 2002 00:36:49 -0000 1.1.2.10
+++ check_dir_acl.c 23 Jun 2002 13:02:32 -0000 1.1.2.11
@@ -105,7 +105,7 @@
assert(topdir_acl->user_acls == NULL);
/* try to set the permissions on directory and see if it works */
- assert(set_dir_ace(topdir_acl, "vasya", dir_perm_access));
+ assert(set_dir_ace(topdir_acl, "trunk", "vasya", dir_perm_access));
assert(dir_permission_granted(topdir_acl, "vasya", dir_perm_access));
assert(!dir_permission_granted(topdir_acl, "vasya", dir_perm_modify));
@@ -131,9 +131,9 @@
assert(topdir_acl);
assert(!topdir_acl->branch_acls_loaded);
- assert(set_dir_ace(topdir_acl, "alice", dir_perm_access) == dir_perm_access);
- assert(set_dir_ace(topdir_acl, "bob", dir_perm_modify) == dir_perm_modify);
- assert(set_dir_ace(topdir_acl, "dave", dir_perm_all) == dir_perm_all);
+ assert(set_dir_ace(topdir_acl, "trunk", "alice", dir_perm_access) == dir_perm_access);
+ assert(set_dir_ace(topdir_acl, "trunk", "bob", dir_perm_modify) == dir_perm_modify);
+ assert(set_dir_ace(topdir_acl, "trunk", "dave", dir_perm_all) == dir_perm_all);
if (store_dir_acl(topdir_acl) != 0) {
perror("Storing dir ACL");
@@ -164,7 +164,7 @@
assert(dir_permission_granted(topdir_acl, "dave", dir_perm_modify));
/* now revoke bob's permissions and check that it persists */
- assert(set_dir_ace(topdir_acl, "bob", dir_perm_none) == dir_perm_none);
+ assert(set_dir_ace(topdir_acl, "trunk", "bob", dir_perm_none) == dir_perm_none);
if (store_dir_acl(topdir_acl) != 0) {
perror("Storing dir ACL");
Index: check_traversing.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/check_traversing.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- check_traversing.c 31 Mar 2002 18:23:44 -0000 1.1.2.5
+++ check_traversing.c 23 Jun 2002 13:02:32 -0000 1.1.2.6
@@ -18,7 +18,7 @@
assert(topdir_acl != NULL);
/* set the no-access permissions for alice to top dir */
- assert(set_dir_ace(topdir_acl, "alice", dir_perm_none) == dir_perm_none);
+ assert(set_dir_ace(topdir_acl, "trunk", "alice", dir_perm_none) == dir_perm_none);
trunk_acl = get_branch_acl(topdir_acl, "trunk");
assert(trunk_acl != NULL);
@@ -32,7 +32,7 @@
/* set the no-modify permissions for bob to top dir */
- assert(set_dir_ace(topdir_acl, "bob", dir_perm_access) == dir_perm_access);
+ assert(set_dir_ace(topdir_acl, "trunk", "bob", dir_perm_access) == dir_perm_access);
trunk_acl = get_branch_acl(topdir_acl, "trunk");
assert(trunk_acl != NULL);
@@ -173,7 +173,7 @@
ssdir_acl = get_dir_acl("./test-acl/sdir/ssdir", "trunk");
assert(ssdir_acl != NULL);
- assert(set_dir_ace(ssdir_acl, "alice", dir_perm_access) == dir_perm_access);
+ assert(set_dir_ace(ssdir_acl, "trunk", "alice", dir_perm_access) == dir_perm_access);
if (store_dir_acl(ssdir_acl) != 0) {
perror("Storing dir ACL");
@@ -211,7 +211,7 @@
sdir_acl = get_dir_acl("./test-acl/sdir", "trunk");
assert(sdir_acl != NULL);
- assert(set_dir_ace(sdir_acl, "alice", dir_perm_access) == dir_perm_access);
+ assert(set_dir_ace(sdir_acl, "trunk", "alice", dir_perm_access) == dir_perm_access);
if (store_dir_acl(sdir_acl) != 0) {
perror("Storing dir ACL");
@@ -252,7 +252,7 @@
sdir_acl = get_dir_acl("./test-acl/sdir", "trunk");
assert(sdir_acl != NULL);
- assert(set_dir_ace(sdir_acl, "alice", dir_perm_access) == dir_perm_access);
+ assert(set_dir_ace(sdir_acl, "trunk", "alice", dir_perm_access) == dir_perm_access);
if (store_dir_acl(sdir_acl) != 0) {
perror("Storing dir ACL");
@@ -263,7 +263,7 @@
ssdir_acl = get_dir_acl("./test-acl/sdir/ssdir", "trunk");
assert(ssdir_acl != NULL);
- assert(set_dir_ace(ssdir_acl, "alice", dir_perm_none) == dir_perm_none);
+ assert(set_dir_ace(ssdir_acl, "trunk", "alice", dir_perm_none) == dir_perm_none);
if (store_dir_acl(ssdir_acl) != 0) {
perror("Storing dir ACL");
|
