Renamed parameters and variables called acl to the_acl as it conflicts

with a Solaris system call.
(This used to be commit 5e547ddcb526be5562db9213c5b36e505e735a2e)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1801164981127ae7aa8e0bd4426f8c1b7685ab23..9a81fa273d9bb5ee22e45eb1ea3d008c62305657 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -241,7 +241,7 @@ void standard_sub_vsnum(char *str, user_struct *vuser, int snum);
 
 /*The following definitions come from  lib/sysacls.c  */
 
-int sys_acl_get_entry( SMB_ACL_T acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
+int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
 int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p);
 int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
 void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d);
@@ -251,8 +251,8 @@ int sys_acl_free( void *obj_p);
 int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
 int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
 int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
-char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen);
-int sys_acl_get_entry( SMB_ACL_T acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
+char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen);
+int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p);
 int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p);
 int sys_acl_get_permset( SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T *permset_p);
 void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d);
@@ -262,7 +262,7 @@ int sys_acl_free( void *obj_p);
 int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset);
 int sys_acl_add_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
 int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm);
-char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen);
+char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen);
 
 /*The following definitions come from  lib/system.c  */
 

diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 2412fb7b0e5c6ae4500f803c7e064ccf89c023e4..e2cf535d3e56a63d856c204463645f7c0c14bed2 100644 (file)
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -51,9 +51,9 @@ extern int DEBUGLEVEL;
 
 /* Identity mapping - easy. */
 
-int sys_acl_get_entry( SMB_ACL_T acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
+int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
 {
-       return acl_get_entry( acl, entry_id, entry_p);
+       return acl_get_entry( the_acl, entry_id, entry_p);
 }
 
 int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
@@ -101,9 +101,9 @@ int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
        return acl_get_perm(permset, perm);
 }
 
-char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen)
+char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
 {
-       return acl_to_text( acl, plen);
+       return acl_to_text( the_acl, plen);
 }
 
 #elif defined(HAVE_SOLARIS_ACLS)
@@ -112,7 +112,7 @@ char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen)
 
 #else /* No ACLs. */
 
-int sys_acl_get_entry( SMB_ACL_T acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
+int sys_acl_get_entry( SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
 {
        return -1;
 }
@@ -162,7 +162,7 @@ int sys_acl_get_perm( SMB_ACL_PERMSET_T permset, SMB_ACL_PERM_T perm)
        return (permset & perm) ? 1 : 0;
 }
 
-char *sys_acl_to_text( SMB_ACL_T acl, ssize_t *plen)
+char *sys_acl_to_text( SMB_ACL_T the_acl, ssize_t *plen)
 {
        return NULL;
 }

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index a7f95f5f5ea14d5dba6d55223a2ba242bdaf0cb3..c017c16bdfa07ac2623e9a1c7b08bffc9b7cb161 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -313,22 +313,22 @@ static BOOL parse_ace(SEC_ACE *ace, char *str)
 }
 
 /* add an ACE to a list of ACEs in a SEC_ACL */
-static BOOL add_ace(SEC_ACL **acl, SEC_ACE *ace)
+static BOOL add_ace(SEC_ACL **the_acl, SEC_ACE *ace)
 {
        SEC_ACL *new;
        SEC_ACE *aces;
-       if (! *acl) {
-               (*acl) = make_sec_acl(3, 1, ace);
+       if (! *the_acl) {
+               (*the_acl) = make_sec_acl(3, 1, ace);
                return True;
        }
 
-       aces = calloc(1+(*acl)->num_aces,sizeof(SEC_ACE));
-       memcpy(aces, (*acl)->ace, (*acl)->num_aces * sizeof(SEC_ACE));
-       memcpy(aces+(*acl)->num_aces, ace, sizeof(SEC_ACE));
-       new = make_sec_acl((*acl)->revision,1+(*acl)->num_aces, aces);
-       free_sec_acl(acl);
+       aces = calloc(1+(*the_acl)->num_aces,sizeof(SEC_ACE));
+       memcpy(aces, (*the_acl)->ace, (*the_acl)->num_aces * sizeof(SEC_ACE));
+       memcpy(aces+(*the_acl)->num_aces, ace, sizeof(SEC_ACE));
+       new = make_sec_acl((*the_acl)->revision,1+(*the_acl)->num_aces, aces);
+       free_sec_acl(the_acl);
        free(aces);
-       (*acl) = new;
+       (*the_acl) = new;
        return True;
 }
 
@@ -466,14 +466,14 @@ static void cacl_dump(struct cli_state *cli, char *filename)
 set the ACLs on a file given an ascii description
 *******************************************************/
 static void cacl_set(struct cli_state *cli, char *filename, 
-                    char *acl, enum acl_mode mode)
+                    char *the_acl, enum acl_mode mode)
 {
        int fnum;
        SEC_DESC *sd, *old;
        int i, j;
        unsigned sd_size;
 
-       sd = sec_desc_parse(acl);
+       sd = sec_desc_parse(the_acl);
 
        if (!sd) return;
        if (test_args) return;
@@ -693,7 +693,7 @@ You can string acls together with spaces, commas or newlines\n\
        static pstring servicesf = CONFIGFILE;
        struct cli_state *cli;
        enum acl_mode mode;
-       char *acl = NULL;
+       char *the_acl = NULL;
 
        setlinebuf(stdout);
 
@@ -739,22 +739,22 @@ You can string acls together with spaces, commas or newlines\n\
                        break;
 
                case 'S':
-                       acl = optarg;
+                       the_acl = optarg;
                        mode = ACL_SET;
                        break;
 
                case 'D':
-                       acl = optarg;
+                       the_acl = optarg;
                        mode = ACL_DELETE;
                        break;
 
                case 'M':
-                       acl = optarg;
+                       the_acl = optarg;
                        mode = ACL_MODIFY;
                        break;
 
                case 'A':
-                       acl = optarg;
+                       the_acl = optarg;
                        mode = ACL_ADD;
                        break;
 
@@ -789,8 +789,8 @@ You can string acls together with spaces, commas or newlines\n\
                if (!cli) exit(1);
        }
 
-       if (acl) {
-               cacl_set(cli, filename, acl, mode);
+       if (the_acl) {
+               cacl_set(cli, filename, the_acl, mode);
        } else {
                cacl_dump(cli, filename);
        }