[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  2238260... s3: Use talloc_tos() in yield_connection()
       via  5c40aa5... s3: Remove unused count_all_current_connections()
      from  9ad1b4c... s3: Fix the CHAIN1 torture test

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


- Log -----------------------------------------------------------------
commit 2238260aa3f85cdb0057dae437f454c8c54d08f7
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 26 17:53:34 2010 +0100

    s3: Use talloc_tos() in yield_connection()

commit 5c40aa59d7d0740b2cdb0201b8d0ea7c3f9f3882
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 26 17:47:44 2010 +0100

    s3: Remove unused count_all_current_connections()

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

Summary of changes:
 source3/include/proto.h           |    1 -
 source3/smbd/connection.c         |   12 ++----------
 source3/winbindd/winbindd_proto.h |    1 -
 3 files changed, 2 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3af9cb0..18e60ca 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6155,7 +6155,6 @@ void msg_force_tdis(struct messaging_context *msg,
 
 bool yield_connection(connection_struct *conn, const char *name);
 int count_current_connections( const char *sharename, bool clear  );
-int count_all_current_connections(void);
 bool claim_connection(connection_struct *conn, const char *name,
 		      uint32 msg_flags);
 bool register_message_flags(bool doreg, uint32 msg_flags);
diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 3b72a95..a54dc8d 100644
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -30,7 +30,8 @@ bool yield_connection(connection_struct *conn, const char *name)
 
 	DEBUG(3,("Yielding connection to %s\n",name));
 
-	if (!(rec = connections_fetch_entry(NULL, conn, name))) {
+	rec = connections_fetch_entry(talloc_tos(), conn, name);
+	if (rec == NULL) {
 		DEBUG(0, ("connections_fetch_entry failed\n"));
 		return False;
 	}
@@ -118,15 +119,6 @@ int count_current_connections( const char *sharename, bool clear  )
 }
 
 /****************************************************************************
- Count the number of connections open across all shares.
-****************************************************************************/
-
-int count_all_current_connections(void)
-{
-        return count_current_connections(NULL, True /* clear stale entries */);
-}
-
-/****************************************************************************
  Claim an entry in the connections database.
 ****************************************************************************/
 
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index d3371b2..ae46843 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -44,7 +44,6 @@ void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
 
 bool yield_connection(connection_struct *conn, const char *name);
 int count_current_connections( const char *sharename, bool clear  );
-int count_all_current_connections(void);
 bool claim_connection(connection_struct *conn, const char *name,
 		      uint32 msg_flags);
 bool register_message_flags(bool doreg, uint32 msg_flags);


-- 
Samba Shared Repository