[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  fe93f7d vfs_fruit: comment fix: the options are documented
       via  1b8a0e6 vfs_fruit: add option "nfs_aces" that controls the NFS ACEs stuff
      from  684c7116 smbd: Offer SMB 3.1.1 by default.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fe93f7d677995c41e15d4af68b4ec064796a4d5b
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Mar 25 12:56:07 2015 +0100

    vfs_fruit: comment fix: the options are documented
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri May  8 21:27:45 CEST 2015 on sn-devel-104

commit 1b8a0e6a26bc212905a160c32b936ef0ea24c0b2
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Mar 25 15:09:02 2015 +0100

    vfs_fruit: add option "nfs_aces" that controls the NFS ACEs stuff
    
    Bug: https://bugzilla.samba.org/show_bug.cgi?id=11213
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/vfs_fruit.8.xml |  9 +++++++++
 source3/modules/vfs_fruit.c       | 11 ++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/vfs_fruit.8.xml b/docs-xml/manpages/vfs_fruit.8.xml
index a9e2e6d..4e296a4 100644
--- a/docs-xml/manpages/vfs_fruit.8.xml
+++ b/docs-xml/manpages/vfs_fruit.8.xml
@@ -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>
 
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 8a5588d..8f582c6 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -128,7 +128,7 @@ struct fruit_config_data {
 	bool unix_info_enabled;
 
 	/*
-	 * Additional undocumented options, all enabled by default,
+	 * Additional options, all enabled by default,
 	 * possibly useful for analyzing performance. The associated
 	 * operations with each of them may be expensive, so having
 	 * the chance to disable them individually gives a chance
@@ -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);


-- 
Samba Shared Repository