[Cvs-nserver-commits] CVS: cvs-nserver/acl dir-acl.c,1.1.2.26,1.1.2.27 dir-acl.h,1.1.2.14,1.1.2.15

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

Update of /cvsroot/cvs-nserver/cvs-nserver/acl
In directory usw-pr-cvs1:/tmp/cvs-serv27489

Modified Files:
      Tag: NCLI-1-11-1
	dir-acl.c dir-acl.h 
Log Message:
set_dir_ace() should take additional "branch" parameter


Index: dir-acl.c
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/dir-acl.c,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -d -r1.1.2.26 -r1.1.2.27
--- dir-acl.c	19 Jun 2002 07:34:43 -0000	1.1.2.26
+++ dir-acl.c	23 Jun 2002 12:59:40 -0000	1.1.2.27
@@ -423,7 +423,7 @@
 	    goto inval;
 
 	if (initial_char == '/')
-	    set_dir_ace(dir_acl, username, parse_dir_permissions(perm_string));
+	    set_dir_ace(dir_acl, username, branch, parse_dir_permissions(perm_string));
 	if (initial_char == 'D')
 	    set_default_file_acl(dir_acl, branch, username, parse_branch_permissions(perm_string));
     }
@@ -599,7 +599,7 @@
 
 
 int
-set_dir_ace (struct DIR_ACL *dir_acl, char *username, int perm)
+set_dir_ace (struct DIR_ACL *dir_acl, char* branch, char *username, int perm)
 {
     dir_acl->user_acls = set_user_ace(dir_acl->user_acls, username, perm);
 

Index: dir-acl.h
===================================================================
RCS file: /cvsroot/cvs-nserver/cvs-nserver/acl/Attic/dir-acl.h,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- dir-acl.h	13 Jun 2002 09:20:44 -0000	1.1.2.14
+++ dir-acl.h	23 Jun 2002 12:59:40 -0000	1.1.2.15
@@ -115,7 +115,7 @@
 int parse_dir_permissions(char *perm_string);
 const char *dir_permissions_string(int perm);
 
-int set_dir_ace (struct DIR_ACL *dir_acl, char *username, int perm);
+int set_dir_ace (struct DIR_ACL *dir_acl, char* branch, char *username, int perm);
 
 int dir_permission_granted (struct DIR_ACL *dir_acl, char *username, int perm);