summaryrefslogtreecommitdiff
path: root/docs-xml/manpages-3
diff options
context:
space:
mode:
authorHolger Hetterich <hhetter@novell.com>2011-05-18 15:24:23 +0200
committerJeremy Allison <jra@samba.org>2011-05-18 21:36:44 +0200
commiteb57d4719fc41352080a514cb40a0aca54153d35 (patch)
treea3a65b87e24806aa8cee1bd22e2949d52e2b4a73 /docs-xml/manpages-3
parentf19ab5d334e3fb15761fb009e5de876dfc6ea785 (diff)
downloadsamba-eb57d4719fc41352080a514cb40a0aca54153d35.tar.gz
samba-eb57d4719fc41352080a514cb40a0aca54153d35.tar.bz2
samba-eb57d4719fc41352080a514cb40a0aca54153d35.zip
Make protocol version 2 the default protocol, and only run on version 1 if V1 is explcitly given as a module option.
I haven't received a single line of feedback on protocol v1 for at least 1 1/2 years, whereas protocol v2 has an active userbase and more people developing around it. This patch includes a manpage update, describing the new version handling, as well as documenting the recent changes making the module transfer the IP address of the client machine as submitted with 464c69609aa7e582f484c1d357b7c6d3eb2bcbe3. Signed-off-by: Jeremy Allison <jra@samba.org> Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Wed May 18 21:36:44 CEST 2011 on sn-devel-104
Diffstat (limited to 'docs-xml/manpages-3')
-rw-r--r--docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
index 882ee6af3f..945070393c 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
@@ -45,6 +45,8 @@
protocol, supporting only a small list of VFS operations, and had
several drawbacks. The protocol version 2 is a try to solve the
problems version 1 had while at the same time adding new features.
+ With the release of Samba 3.6.0, the module will run protocol version 2
+ by default.
</para>
</refsect1>
@@ -77,6 +79,7 @@
<listitem><para><command>SHARE</command> - the name of the share on which the VFS operation occured</para></listitem>
<listitem><para><command>FILENAME</command> - the name of the file that was used by the VFS operation</para></listitem>
<listitem><para><command>TIMESTAMP</command> - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occured</para></listitem>
+ <listitem><para><command>IP</command> - The IP Address (v4 or v6) of the client machine that initiated the VFS operation.</para></listitem>
</itemizedlist>
</para>
@@ -224,9 +227,9 @@
<varlistentry>
<term>smb_traffic_analyzer:protocol_version = STRING</term>
<listitem>
- <para>If STRING matches to V1 or is not given at all, the module
- will use version 1 of the protocol. If STRING matches to "V2"
- the module will use version 2 of the protocol.
+ <para>If STRING matches to V1, the module will use version 1 of the
+ protocol. If STRING is not given, the module will use version 2 of the
+ protocol, which is the default.
</para>
</listitem>
</varlistentry>
@@ -241,7 +244,6 @@
<smbconfsection name="[example_share]"/>
<smbconfoption name="path">/data/example</smbconfoption>
<smbconfoption name="vfs_objects">smb_traffic_analyzer</smbconfoption>
- <smbconfoption name="smb_traffic_analyzer:protocol_version">V2</smbconfoption>
<smbconfoption name="smb_traffic_analyzer:host">examplehost</smbconfoption>
<smbconfoption name="smb_traffic_analyzer:port">3491</smbconfoption>
</programlisting>