[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  13a4922... s3: Remove a conn NULL check from claim_connection
      from  19280b6... s3: Fix an uninitialized variable

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


- Log -----------------------------------------------------------------
commit 13a4922ae631578fcc88eb6b98a15361fd805186
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Aug 14 12:23:13 2010 +0200

    s3: Remove a conn NULL check from claim_connection
    
    We've already dereferenced conn before

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

Summary of changes:
 source3/smbd/connection.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 5acc821..f4f4fc2 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -127,7 +127,6 @@ bool claim_connection(connection_struct *conn, const char *name)
 	struct connections_data crec;
 	TDB_DATA dbuf;
 	NTSTATUS status;
-	char addr[INET6_ADDRSTRLEN];
 
 	DEBUG(5,("claiming [%s]\n", name));
 
@@ -148,9 +147,7 @@ bool claim_connection(connection_struct *conn, const char *name)
 	crec.start = time(NULL);
 
 	strlcpy(crec.machine,get_remote_machine_name(),sizeof(crec.machine));
-	strlcpy(crec.addr,conn?conn->client_address:
-			client_addr(get_client_fd(),addr,sizeof(addr)),
-		sizeof(crec.addr));
+	strlcpy(crec.addr, conn->client_address, sizeof(crec.addr));
 
 	dbuf.dptr = (uint8 *)&crec;
 	dbuf.dsize = sizeof(crec);


-- 
Samba Shared Repository