sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Make protocol version 2 the default protocol, and only run on version 1 if V1 is explcitly given as a module option.

Browse Source 
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
464c69609a.

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
This commit is contained in:
Holger Hetterich 2011-05-18 15:24:23 +02:00 committed by Jeremy Allison
parent f19ab5d334
commit eb57d4719f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
View File

@ -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>

11
source3/modules/vfs_smb_traffic_analyzer.c
View File

@ -452,7 +452,7 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
"protocol_version", NULL );
if ( protocol_version == NULL || strcmp( protocol_version,"V1") == 0) {
if (protocol_version != NULL && strcmp(protocol_version,"V1") == 0) {
struct rw_data *s_data = (struct rw_data *) data;
@ -489,7 +489,10 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
return;
}
} else if ( strcmp( protocol_version, "V2") == 0) {
} else {
/**
* Protocol 2 is used by default.
*/
switch( vfs_operation ) {
case vfs_id_open: ;
@ -557,10 +560,6 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
return;
}
} else {
DEBUG(1, ("smb_traffic_analyzer_send_data_socket: "
"error, unknown protocol given!\n"));
return;
}
if (!str) {