Rename inherit_access_acl() -> inherit_access_posix_acl() to make use clear.

Jeremy.
(This used to be commit b739c7f1cdb2b19a380b06681b00dcf490d788a9)

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 0d1dd31cd60fc7f3659a93c44b4e31137ccda3fd..dd518b90deae73d955bdb9e8f1229940575d1b32 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -323,7 +323,7 @@ static NTSTATUS open_file(files_struct *fsp,
 
                        /* Inherit the ACL if required */
                        if (lp_inherit_perms(SNUM(conn))) {
-                               inherit_access_acl(conn, parent_dir, path,
+                               inherit_access_posix_acl(conn, parent_dir, path,
                                                   unx_mode);
                        }
 
@@ -2058,7 +2058,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
        }
 
        if (lp_inherit_perms(SNUM(conn))) {
-               inherit_access_acl(conn, parent_dir, name, mode);
+               inherit_access_posix_acl(conn, parent_dir, name, mode);
        }
 
        if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS)) {

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 61ee5b4352eb180becdd30df96590298ccee3f8e..732199e0e9ea7771683f664b586fd3e4abdccbb2 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3783,7 +3783,7 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo
  resulting ACL on TO.  Note that name is in UNIX character set.
 ****************************************************************************/
 
-static int copy_access_acl(connection_struct *conn, const char *from, const char *to, mode_t mode)
+static int copy_access_posix_acl(connection_struct *conn, const char *from, const char *to, mode_t mode)
 {
        SMB_ACL_T posix_acl = NULL;
        int ret = -1;
@@ -3810,7 +3810,7 @@ static int copy_access_acl(connection_struct *conn, const char *from, const char
 
 int chmod_acl(connection_struct *conn, const char *name, mode_t mode)
 {
-       return copy_access_acl(conn, name, name, mode);
+       return copy_access_posix_acl(conn, name, name, mode);
 }
 
 /****************************************************************************
@@ -3838,13 +3838,13 @@ static bool directory_has_default_posix_acl(connection_struct *conn, const char
  inherit this Access ACL to file name.
 ****************************************************************************/
 
-int inherit_access_acl(connection_struct *conn, const char *inherit_from_dir,
+int inherit_access_posix_acl(connection_struct *conn, const char *inherit_from_dir,
                       const char *name, mode_t mode)
 {
        if (directory_has_default_posix_acl(conn, inherit_from_dir))
                return 0;
 
-       return copy_access_acl(conn, inherit_from_dir, name, mode);
+       return copy_access_posix_acl(conn, inherit_from_dir, name, mode);
 }
 
 /****************************************************************************

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 41f2a15cb86f08750951d1dab5e437cc1c0de9dd..e7157d02ecc8b42a5b0dfec6ab0018bd17097a5f 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -5868,7 +5868,7 @@ static NTSTATUS smb_unix_mknod(connection_struct *conn,
         */
 
        if (lp_inherit_perms(SNUM(conn))) {
-               inherit_access_acl(
+               inherit_access_posix_acl(
                        conn, parent_dirname(fname),
                        fname, unixmode);
        }