diff options
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -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 | ||||
| -rw-r--r-- | source4/param/share_classic.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 142eb62e772..3ba3083fbec 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -45,7 +45,7 @@ FN_LOCAL_INTEGER(max_connections, max_connections) FN_LOCAL_INTEGER(csc_policy, csc_policy) FN_LOCAL_INTEGER(create_mask, create_mask) FN_LOCAL_INTEGER(force_create_mode, force_create_mode) -FN_LOCAL_INTEGER(dir_mask, dir_mask) +FN_LOCAL_INTEGER(directory_mask, dir_mask) FN_LOCAL_INTEGER(force_dir_mode, force_dir_mode) FN_LOCAL_STRING(preexec, preexec) FN_LOCAL_STRING(postexec, postexec) diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 2d49a943e10..09d9a6641f7 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 29cd93e0945..e0cf97c28a5 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 2667848e978..e09c23bfe11 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)); } diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c index c78990ec34e..61cadf7be81 100644 --- a/source4/param/share_classic.c +++ b/source4/param/share_classic.c @@ -146,7 +146,7 @@ static int sclassic_int_option(struct share_config *scfg, const char *opt_name, } if (strcmp(opt_name, SHARE_DIR_MASK) == 0) { - return lpcfg_dir_mask(s, lpcfg_default_service(lp_ctx)); + return lpcfg_directory_mask(s, lpcfg_default_service(lp_ctx)); } if (strcmp(opt_name, SHARE_FORCE_DIR_MODE) == 0) { |