diff options
| author | Holger Hetterich <hhetter@novell.com> | 2011-05-18 15:24:23 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-05-18 21:36:44 +0200 |
| commit | eb57d4719fc41352080a514cb40a0aca54153d35 (patch) | |
| tree | a3a65b87e24806aa8cee1bd22e2949d52e2b4a73 /source3 | |
| parent | f19ab5d334e3fb15761fb009e5de876dfc6ea785 (diff) | |
| download | samba-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 'source3')
| -rw-r--r-- | source3/modules/vfs_smb_traffic_analyzer.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index d1340c310c..4146d78624 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -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) { |