[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  f9e4105 s3:smbd: remove unused 'connection_struct->used'
      from  c531aac Added torture test for bug #8910. Test remove_duplicate_addrs2().

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


- Log -----------------------------------------------------------------
commit f9e4105f4170181989c44a2326a8a8a89314fc98
Author: Michael Adam <obnox at samba.org>
Date:   Tue May 22 11:56:36 2012 +0200

    s3:smbd: remove unused 'connection_struct->used'
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue May 22 16:42:22 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/include/smb.h  |    1 -
 source3/smbd/reply.c   |    2 --
 source3/smbd/service.c |    1 -
 3 files changed, 0 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb.h b/source3/include/smb.h
index b5c674d..245ff7b 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -400,7 +400,6 @@ typedef struct connection_struct {
 
 	time_t lastused;
 	time_t lastused_count;
-	bool used;
 	int num_files_open;
 	unsigned int num_smb_operations; /* Count of smb operations on this tree. */
 	int encrypt_level;
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 45f761c..b93052a 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5063,8 +5063,6 @@ void reply_tdis(struct smb_request *req)
 		return;
 	}
 
-	conn->used = False;
-
 	close_cnum(conn,req->vuid);
 	req->conn = NULL;
 
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 7b538b0..d0fd215 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -576,7 +576,6 @@ static NTSTATUS make_connection_snum(struct smbd_server_connection *sconn,
 
 	conn->num_files_open = 0;
 	conn->lastused = conn->lastused_count = time(NULL);
-	conn->used = True;
 	conn->printer = (strncmp(dev,"LPT",3) == 0);
 	conn->ipc = ( (strncmp(dev,"IPC",3) == 0) ||
 		      ( lp_enable_asu_support() && strequal(dev,"ADMIN$")) );


-- 
Samba Shared Repository