The branch, master has been updated
via 7f70e216fcd docs: fix typo in "ntlm auth" doc in smb.conf man page
via 83859668d5f docs: add documentation for the samba-tool ntacl
changedomsid command
from 6aa5d1f684f CVE-2019-12436 dsdb/paged_results: ignore successful
results without messages
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7f70e216fcda2ebfbdf952471931f9f3739a6e8e
Author: Björn Baumbach <[email protected]>
Date: Wed Jun 19 22:35:43 2019 +0200
docs: fix typo in "ntlm auth" doc in smb.conf man page
Thanks to Amit Kumar <[email protected]>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13784
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Björn Baumbach <[email protected]>
Autobuild-Date(master): Thu Jun 20 17:14:50 UTC 2019 on sn-devel-184
commit 83859668d5f8695134dc6739ef8dec2edc3542ff
Author: Björn Baumbach <[email protected]>
Date: Wed Jun 19 12:22:01 2019 +0200
docs: add documentation for the samba-tool ntacl changedomsid command
Signed-off-by: Björn Baumbach <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/samba-tool.8.xml | 71 +++++++++++++++++++++++++++++++
docs-xml/smbdotconf/security/ntlmauth.xml | 2 +-
2 files changed, 72 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/samba-tool.8.xml
b/docs-xml/manpages/samba-tool.8.xml
index f94864b07c9..7f8f02d619a 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -664,6 +664,77 @@
<para>Manage NT ACLs.</para>
</refsect2>
+<refsect3>
+ <title>ntacl changedomsid
<replaceable>original-domain-SID</replaceable>
<replaceable>new-domain-SID</replaceable> <replaceable>file</replaceable>
[options]</title>
+ <para>Change the domain SID for ACLs.
+ Can be used to change all entries in acl_xattr when the machine's SID
+ has accidentially changed or the data set has been copied
+ to another machine either via backup/restore or rsync.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>--use-ntvfs</term>
+ <listitem><para>
+ Set the ACLs directly to the TDB or xattr. The POSIX permissions will
+ NOT be changed, only the NT ACL will be stored.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--service=SERVICE</term>
+ <listitem><para>
+ Specify the name of the smb.conf service to use. This option is
+ required in combination with the --use-s3fs option.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--use-s3fs</term>
+ <listitem><para>
+ Set the ACLs for use with the default s3fs file server via the VFS
+ layer. This option requires a smb.conf service, specified by the
+ --service=SERVICE option.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--xattr-backend=[native|tdb]</term>
+ <listitem><para>
+ Specify the xattr backend type (native fs or tdb).
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--eadb-file=EADB_FILE</term>
+ <listitem><para>
+ Name of the tdb file where attributes are stored.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--recursive</term>
+ <listitem><para>
+ Set the ACLs for directories and their contents recursively.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--follow-symlinks</term>
+ <listitem><para>
+ Follow symlinks when --recursive is specified.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--verbose</term>
+ <listitem><para>
+ Verbosely list files and ACLs which are being processed.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect3>
+
+
<refsect3>
<title>ntacl get <replaceable>file</replaceable> [options]</title>
<para>Get ACLs on a file.</para>
diff --git a/docs-xml/smbdotconf/security/ntlmauth.xml
b/docs-xml/smbdotconf/security/ntlmauth.xml
index dd5dbaea117..d22f0644fb2 100644
--- a/docs-xml/smbdotconf/security/ntlmauth.xml
+++ b/docs-xml/smbdotconf/security/ntlmauth.xml
@@ -60,7 +60,7 @@
</itemizedlist>
<para>The default changed from <constant>yes</constant> to
- <constant>no</constant> with Samba 4.5. The default chagned again
+ <constant>no</constant> with Samba 4.5. The default changed again
to <constant>ntlmv2-only</constant> with Samba 4.7, however the
behaviour is unchanged.</para>
</description>
--
Samba Shared Repository
