summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-05-02 12:54:53 -0700
committerJeremy Allison <jra@samba.org>2008-05-02 12:54:53 -0700
commit85dc0ad7beb50dbab6d98a22b114f20537425268 (patch)
tree9e6eea2de72fd3774a67c01a04dde8519b8e9e45 /source3
parent96e969c9eb60cf1d96ba9aeeb4c991d2acf4c095 (diff)
downloadsamba-85dc0ad7beb50dbab6d98a22b114f20537425268.tar.gz
samba-85dc0ad7beb50dbab6d98a22b114f20537425268.tar.bz2
samba-85dc0ad7beb50dbab6d98a22b114f20537425268.zip
Rename inherit_access_acl() -> inherit_access_posix_acl() to make use clear.
Jeremy. (This used to be commit b739c7f1cdb2b19a380b06681b00dcf490d788a9)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/open.c4
-rw-r--r--source3/smbd/posix_acls.c8
-rw-r--r--source3/smbd/trans2.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 0d1dd31cd6..dd518b90de 100644
--- 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 61ee5b4352..732199e0e9 100644
--- 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 41f2a15cb8..e7157d02ec 100644
--- 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);
}