sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

vfs_fruit: add option "nfs_aces" that controls the NFS ACEs stuff

Browse Source 
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11213

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2015-03-25 15:09:02 +01:00 committed by Jeremy Allison
parent 684c711665
commit 1b8a0e6a26
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs-xml/manpages/vfs_fruit.8.xml
View File

@ -188,6 +188,15 @@
</listitem>
</varlistentry>
<varlistentry>
<term>fruit:nfs_aces = yes | no</term>
<listitem>
<para>Whether support for querying and modifying the
UNIX mode of directory entries via NFS ACEs is enabled,
default <emphasis>yes</emphasis>.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>

9
source3/modules/vfs_fruit.c
View File

@ -1338,6 +1338,10 @@ static int init_fruit_config(vfs_handle_struct *handle)
config->use_aapl = true;
}
if (lp_parm_bool(-1, FRUIT_PARAM_TYPE_NAME, "nfs_aces", true)) {
config->unix_info_enabled = true;
}
if (lp_parm_bool(SNUM(handle->conn),
"readdir_attr", "aapl_rsize", true)) {
config->readdir_attr_rsize = true;
@ -1831,8 +1835,9 @@ static NTSTATUS check_aapl(vfs_handle_struct *handle,
* The client doesn't set the flag, so we can't check
* for it and just set it unconditionally
*/
server_caps |= SMB2_CRTCTX_AAPL_SUPPORTS_NFS_ACE;
config->unix_info_enabled = true;
if (config->unix_info_enabled) {
server_caps |= SMB2_CRTCTX_AAPL_SUPPORTS_NFS_ACE;
}
SBVAL(p, 0, server_caps);
ok = data_blob_append(req, &blob, p, 8);