[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  2c6d488... s3: fix build issue on Tru64
      from  f632244... s3: normalize "Changing password for" msg IDs and STRs

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 2c6d488537962fdab718aac68cab7f790fe480e5
Author: Björn Jacke <b...@sernet.de>
Date:   Sun Feb 7 20:10:57 2010 +0100

    s3: fix build issue on Tru64
    
    Thanks, Volker for the hint - acl_type is a macro on Tru64. Renamed it
    to acltype. This fixes #7103.
    (cherry picked from commit 328a6264a7b64dce9378bf9c9c2ab3aeb7d755c7)

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_acl_common.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 8c15cc7..10781c4 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -169,7 +169,7 @@ static void 
add_directory_inheritable_components(vfs_handle_struct *handle,
        struct connection_struct *conn = handle->conn;
        int num_aces = (psd->dacl ? psd->dacl->num_aces : 0);
        struct smb_filename smb_fname;
-       enum security_ace_type acl_type;
+       enum security_ace_type acltype;
        uint32_t access_mask;
        mode_t dir_mode;
        mode_t file_mode;
@@ -203,30 +203,30 @@ static void 
add_directory_inheritable_components(vfs_handle_struct *handle,
                memcpy(new_ace_list, psd->dacl->aces,
                        num_aces * sizeof(struct security_ace));
        }
-       access_mask = map_canon_ace_perms(SNUM(conn), &acl_type,
+       access_mask = map_canon_ace_perms(SNUM(conn), &acltype,
                                mode & 0700, false);
 
        init_sec_ace(&new_ace_list[num_aces],
                        &global_sid_Creator_Owner,
-                       acl_type,
+                       acltype,
                        access_mask,
                        SEC_ACE_FLAG_CONTAINER_INHERIT|
                                SEC_ACE_FLAG_OBJECT_INHERIT|
                                SEC_ACE_FLAG_INHERIT_ONLY);
-       access_mask = map_canon_ace_perms(SNUM(conn), &acl_type,
+       access_mask = map_canon_ace_perms(SNUM(conn), &acltype,
                                (mode << 3) & 0700, false);
        init_sec_ace(&new_ace_list[num_aces+1],
                        &global_sid_Creator_Group,
-                       acl_type,
+                       acltype,
                        access_mask,
                        SEC_ACE_FLAG_CONTAINER_INHERIT|
                                SEC_ACE_FLAG_OBJECT_INHERIT|
                                SEC_ACE_FLAG_INHERIT_ONLY);
-       access_mask = map_canon_ace_perms(SNUM(conn), &acl_type,
+       access_mask = map_canon_ace_perms(SNUM(conn), &acltype,
                                (mode << 6) & 0700, false);
        init_sec_ace(&new_ace_list[num_aces+2],
                        &global_sid_World,
-                       acl_type,
+                       acltype,
                        access_mask,
                        SEC_ACE_FLAG_CONTAINER_INHERIT|
                                SEC_ACE_FLAG_OBJECT_INHERIT|


-- 
Samba Shared Repository