summaryrefslogtreecommitdiffstats
path: root/source3/smbd
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-03 14:48:28 +1300
committerJeremy Allison <jra@samba.org>2014-02-07 16:19:09 -0800
commit904a2358327f7bf57b60a179b4d927bd16c162f5 (patch)
treec55f4dc97b37c2a1e3b0e09a47713ecf5b575e1a /source3/smbd
parent17adbbcad7e401dd544dfa76f7ec9aeb6a847381 (diff)
downloadsamba-904a2358327f7bf57b60a179b4d927bd16c162f5.tar.gz
samba-904a2358327f7bf57b60a179b4d927bd16c162f5.tar.xz
samba-904a2358327f7bf57b60a179b4d927bd16c162f5.zip
param: rename lp function and variable from 'force_dir_mode' to 'force_directory_mode'
Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/dosmode.c2
-rw-r--r--source3/smbd/trans2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index e0cf97c28a5..2a6b3fe9607 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -164,7 +164,7 @@ mode_t unix_mode(connection_struct *conn, int dosmode,
/* Apply directory mask */
result &= lp_directory_mask(SNUM(conn));
/* Add in force bits */
- result |= lp_force_dir_mode(SNUM(conn));
+ result |= lp_force_directory_mode(SNUM(conn));
}
} else {
if (lp_map_archive(SNUM(conn)) && IS_DOS_ARCHIVE(dosmode))
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index e09c23bfe11..2d9aefafa45 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1407,7 +1407,7 @@ static NTSTATUS unix_perms_from_wire( connection_struct *conn,
*/
ret &= lp_directory_mask(SNUM(conn));
/* Add in force bits */
- ret |= lp_force_dir_mode(SNUM(conn));
+ ret |= lp_force_directory_mode(SNUM(conn));
}
*ret_perms = ret;