diff options
| author | Michael Adam <obnox@samba.org> | 2014-02-02 14:59:30 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-03 13:27:25 +1300 |
| commit | 43d59d5cc46b43cbccfe8ec24fb7ca433e80f22b (patch) | |
| tree | c807bedf887b5c0d1f5b03df4f9568231e0a3991 /source3 | |
| parent | 4b403e912dbff0ac4ca7cc9e76872d314a86da37 (diff) | |
| download | samba-43d59d5cc46b43cbccfe8ec24fb7ca433e80f22b.tar.gz samba-43d59d5cc46b43cbccfe8ec24fb7ca433e80f22b.tar.xz samba-43d59d5cc46b43cbccfe8ec24fb7ca433e80f22b.zip | |
loadparm: rename lp[cfg]_dir_mask to lp[cfg]_directory_mask for consistency with docs
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_default.c | 2 | ||||
| -rw-r--r-- | source3/smbd/dosmode.c | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 2d49a943e1..09d9a6641f 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -437,7 +437,7 @@ static int vfswrap_mkdir(vfs_handle_struct *handle, const char *path, mode_t mod if (lp_inherit_acls(SNUM(handle->conn)) && parent_dirname(talloc_tos(), path, &parent, NULL) && (has_dacl = directory_has_default_acl(handle->conn, parent))) - mode = (0777 & lp_dir_mask(SNUM(handle->conn))); + mode = (0777 & lp_directory_mask(SNUM(handle->conn))); TALLOC_FREE(parent); diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index 29cd93e094..e0cf97c28a 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -162,7 +162,7 @@ mode_t unix_mode(connection_struct *conn, int dosmode, result |= (S_IXUSR | S_IXGRP | S_IXOTH); /* Apply directory mask */ - result &= lp_dir_mask(SNUM(conn)); + result &= lp_directory_mask(SNUM(conn)); /* Add in force bits */ result |= lp_force_dir_mode(SNUM(conn)); } diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 2667848e97..e09c23bfe1 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1405,7 +1405,7 @@ static NTSTATUS unix_perms_from_wire( connection_struct *conn, * "directory mask"/"force directory mode" are * only applied to new directories, not existing ones. */ - ret &= lp_dir_mask(SNUM(conn)); + ret &= lp_directory_mask(SNUM(conn)); /* Add in force bits */ ret |= lp_force_dir_mode(SNUM(conn)); } |