[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  b81f8b1... s3-vfs: Send the share name instead of the path in smb_traffic_analyzer.
      from  23eb288... s4-smbtorture: skip driverName and printerName DsSpooler tests for now.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b81f8b131c28c4c300d41eebb054bbf649bfbae4
Author: Holger Hetterich <hhetter at novell.com>
Date:   Sun May 30 18:52:17 2010 +0200

    s3-vfs: Send the share name instead of the path in smb_traffic_analyzer.
    
    In protocol v2, the name of the service should be sent instead of the
    path.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_smb_traffic_analyzer.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 6384c97..a73d9d0 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -298,6 +298,8 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
 	char *usersid = NULL;
 	char *buf = NULL;
 	char *vfs_operation_str = NULL;
+	const char *service_name = lp_const_servicename(handle->conn->params->service);
+
 	/*
 	 * first create the data that is transfered with any VFS op
 	 * These are, in the following order:
@@ -343,6 +345,7 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
 		tm->tm_sec, \
 		(int)seconds);
 	len = strlen( timestr );
+
 	/* create the string of common data */
 	buf = talloc_asprintf(ctx,
 		"%s%04u%s%04u%s%04u%s%04u%s%04u%s%04u%s",
@@ -353,8 +356,8 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
 		username,
 		(unsigned int) strlen(sidstr),
 		sidstr,
-		(unsigned int) strlen(handle->conn->connectpath),
-		handle->conn->connectpath,
+		(unsigned int) strlen(service_name),
+		service_name,
 		(unsigned int)
 		strlen(handle->conn->server_info->info3->base.domain.string),
 		handle->conn->server_info->info3->base.domain.string,


-- 
Samba Shared Repository