The branch, master has been updated via e5ecef6 WHATSNEW: list SMB3 as max protocol and durable handles as changes since 4.0 beta8 via ebdf147 docs: describe the new parameter "durable handles" in the smb.conf manpage via 2491453 docs: add desciption of new parameter "kernel share modes" to the smb.conf manpage via 4811e58 docs: have configure correctly report ability to build manpages via eb4483e release-scripts: adapt build-manpages-nogit to renamed manpage directory via f5da2c1 release-scripts: adapt build-manpages-git to moved manpage directory from 2ea0f6c s3:quota-nfs: add RQ_PATHLEN define for systems that don't have it
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e5ecef66391235ecb6a8da80140a760e02f2d7c2 Author: Michael Adam <ob...@samba.org> Date: Mon Sep 10 01:16:51 2012 +0200 WHATSNEW: list SMB3 as max protocol and durable handles as changes since 4.0 beta8 Autobuild-User(master): Michael Adam <ob...@samba.org> Autobuild-Date(master): Mon Sep 10 02:58:49 CEST 2012 on sn-devel-104 commit ebdf147d4a84bb092e795cefac1a4e28393fd343 Author: Michael Adam <ob...@samba.org> Date: Mon Sep 10 00:50:38 2012 +0200 docs: describe the new parameter "durable handles" in the smb.conf manpage commit 24914531fc86f7fe45537ab2e63db88031d94787 Author: Michael Adam <ob...@samba.org> Date: Mon Sep 10 00:56:14 2012 +0200 docs: add desciption of new parameter "kernel share modes" to the smb.conf manpage commit 4811e5852b3848f17b6eb920b7781fda287c9189 Author: Michael Adam <ob...@samba.org> Date: Mon Sep 10 00:32:20 2012 +0200 docs: have configure correctly report ability to build manpages commit eb4483e63c643bc06c7adcb6b81f63769e33e64b Author: Michael Adam <ob...@samba.org> Date: Mon Sep 10 00:57:28 2012 +0200 release-scripts: adapt build-manpages-nogit to renamed manpage directory commit f5da2c1356b0389357f61c430222a87018173fd3 Author: Michael Adam <ob...@samba.org> Date: Mon Sep 10 00:56:44 2012 +0200 release-scripts: adapt build-manpages-git to moved manpage directory ----------------------------------------------------------------------- Summary of changes: WHATSNEW.txt | 27 +++++++++++++++++++ docs-xml/configure.ac | 2 +- docs-xml/smbdotconf/locking/kernelsharemodes.xml | 31 ++++++++++++++++++++++ docs-xml/smbdotconf/protocol/durablehandles.xml | 27 +++++++++++++++++++ release-scripts/build-manpages-git | 4 +- release-scripts/build-manpages-nogit | 4 +- 6 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 docs-xml/smbdotconf/locking/kernelsharemodes.xml create mode 100644 docs-xml/smbdotconf/protocol/durablehandles.xml Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 4b1f0fe..8efeecb 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -97,6 +97,33 @@ Finally, a new scripting interface has been added to Samba 4, allowing Python programs to interface to Samba's internals, and many tools and internal workings of the DC code is now implemented in python. +CHANGES SINCE beta8 +=================== + +The smbd file server now offers SMB3 as the maximum protocol +by default. Samba can negotiate version 3 of the SMB protocol +and supports the required features, including all required +features of SMB 2.1 and SMB 2.0. Note that this does not imply +that Samba implements all features of SMB3 since many of them +are optional capabilities. Examples of features that Samba does +not implement yet are leases (SMB 2.1) and multi-channel (SMB 3). + +Samba now offers an initial support for SMB2 durable file handles. +These are enabled by default and can be turned off on a per share +basis by setting "durable handles = no" on the share configuration. +Note that in order to prevent conflicts with other applications +accessing the same files, durable handles are only granted on +shares that are configured for CIFS/SMB2-only access, i.e. more +explicitly shares that are configured for minimal interoperability +with these settings: + + kernel oplocks = no + kernel share modes = no + posix locking = no + +The option "kernel share modes" has been introduced to be able +to turn the translation of SMB share modes into kernel flocks +off. CHANGES SINCE beta7 ===================== diff --git a/docs-xml/configure.ac b/docs-xml/configure.ac index 4339c00..360c942 100644 --- a/docs-xml/configure.ac +++ b/docs-xml/configure.ac @@ -38,7 +38,7 @@ DOCS_DEFINE_TARGET(LATEX, ALL, [LaTeX versions], [tex ps pdf]) DOCS_DEFINE_TARGET(HTML, ALL, [HTML versions], [html]) DOCS_DEFINE_TARGET(HTMLHELP, ALL, [HTML Help versions], [htmlhelp]) DOCS_DEFINE_TARGET(HTMLMAN, ALL, [HTML versions of the manpages], [htmlman3]) -DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages]) +DOCS_DEFINE_TARGET(MANPAGES, ALL, [manpages], [manpages]) DOCS_DEFINE_TARGET(PEARSON, ALL, [pearson-compatible XML], [pearson]) DOCS_DEFINE_TARGET(PLUCKER, HTML, [plucker versions], [plucker]) DOCS_DEFINE_TARGET(VALIDATE, ALL, [validating docbook output], []) diff --git a/docs-xml/smbdotconf/locking/kernelsharemodes.xml b/docs-xml/smbdotconf/locking/kernelsharemodes.xml new file mode 100644 index 0000000..5b64b77 --- /dev/null +++ b/docs-xml/smbdotconf/locking/kernelsharemodes.xml @@ -0,0 +1,31 @@ +<samba:parameter name="kernel share modes" + type="boolean" + context="S" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> +<description> + <para> + This parameter controls whether SMB share modes are + translated into UNIX flocks. + </para> + + <para> + Kernel share modes provide a minimal level of interoperability + with local UNIX processes and NFS operations by preventing + access with flocks corresponding to the SMB share modes. + Generally, it is very desirable to leave this enabled. + </para> + + <para> + Note that in order to use SMB2 durable file handles on a share, + you have to turn kernel share modes off. + </para> + + <para> + This parameter defaults to <constant>yes</constant> and + is translated to a no-op on systems that do not have the + necessary kernel flock support. + </para> +</description> + +<value type="default">yes</value> +</samba:parameter> diff --git a/docs-xml/smbdotconf/protocol/durablehandles.xml b/docs-xml/smbdotconf/protocol/durablehandles.xml new file mode 100644 index 0000000..011fabd --- /dev/null +++ b/docs-xml/smbdotconf/protocol/durablehandles.xml @@ -0,0 +1,27 @@ +<samba:parameter name="durable handles" + context="S" + advanced="1" + type="boolean" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> +<description> + <para> + This boolean parameter controls + whether Samba can grant SMB2 durable file handles on a share. + </para> + <para> + Note that durable handles are only enabled if + <smbconfoption name="kernel oplocks">no</smbconfoption>, + <smbconfoption name="kernel share modes">no</smbconfoption>, and + <smbconfoption name="posix locking">no</smbconfoption>, + i.e. if the share is configured for CIFS/SMB2 only access, + not supporting interoperability features with local UNIX processes + or NFS operations. + </para> + <para> + Also note that, for the time being, durability is not granted + for a handle that has the delete on close flag set. + </para> +</description> + +<value type="default">yes</value> +</samba:parameter> diff --git a/release-scripts/build-manpages-git b/release-scripts/build-manpages-git index 0de106c..3ba05c7 100755 --- a/release-scripts/build-manpages-git +++ b/release-scripts/build-manpages-git @@ -36,14 +36,14 @@ autoconf || _exit "Error running autoconf." export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" -make manpages3 || _exit "Error running make manpages3" +make manpages || _exit "Error running make manpages" popd test -e ${DOCS_DIR}/manpages && rm -rf ${DOCS_DIR}/manpages mkdir -p ${DOCS_DIR}/manpages -rsync -Ca ${DOCS_XML_DIR}/output/manpages-3/ ${DOCS_DIR}/manpages +rsync -Ca ${DOCS_XML_DIR}/output/manpages/ ${DOCS_DIR}/manpages echo "Success" exit diff --git a/release-scripts/build-manpages-nogit b/release-scripts/build-manpages-nogit index 0c020ec..fc9ddc0 100755 --- a/release-scripts/build-manpages-nogit +++ b/release-scripts/build-manpages-nogit @@ -39,14 +39,14 @@ make clean || _exit "Error running make clean" # re-establish catalog (has been removed by make clean...) ./config.status -make manpages3 || _exit "Error running make manpages3" +make manpages || _exit "Error running make manpages" popd test -e ${DOCS_DIR}/manpages && rm -rf ${DOCS_DIR}/manpages mkdir -p ${DOCS_DIR}/manpages -rsync -Ca ${DOCS_XML_DIR}/output/manpages-3/ ${DOCS_DIR}/manpages +rsync -Ca ${DOCS_XML_DIR}/output/manpages/ ${DOCS_DIR}/manpages echo "Success" exit -- Samba Shared Repository