[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  3c092c7... Second part of the fix for bug #7020 - smbd using 2G memory.
       via  cabe8f0... Fix bug #7020 - smbd using 2G memory.
       via  6a448ef... WHATSNEW: Start release notes for 3.4.5.
       via  459d41e... VERSION: Raise version number up to 3.4.5.
      from  945b2d1... WHATSNEW: Update changes.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 3c092c7acb18620e3769c791a9ea4055605247ee
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 6 13:29:35 2010 -0800

    Second part of the fix for bug #7020 - smbd using 2G memory.
    
    There was a second leak in the processing of the out_data.frag
    prs_struct. It needs freeing once the current pdu has been returned
    asynchronously.
    
    Jeremy.

commit cabe8f0ee859013d49fba011a5a9ac0112d7b001
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 5 14:38:56 2010 -0800

    Fix bug #7020 - smbd using 2G memory.
    
    When deferring an async pipe writeX and readX transfer
    the outstanding request struct onto the conn struct. This
    needs freeing after the packet is finally processed.
    
    Jeremy.

commit 6a448ef299b24d3d02bb402c54105affd8e92b85
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 11 12:05:54 2010 +0100

    WHATSNEW: Start release notes for 3.4.5.
    
    Karolin

commit 459d41e5fc651a0820a7a1b571179d81b4546df3
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Jan 11 12:03:45 2010 +0100

    VERSION: Raise version number up to 3.4.5.
    
    Karolin

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

Summary of changes:
 WHATSNEW.txt                      |   49 +++++++++++++++++++++++++++++++++++-
 source3/VERSION                   |    2 +-
 source3/rpc_server/srv_pipe_hnd.c |    7 +++++
 source3/smbd/pipes.c              |   10 +++++++
 4 files changed, 65 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 18d0d31..5c2d63a 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,49 @@
                    =============================
+                   Release Notes for Samba 3.4.5
+			 January , 2010
+                   =============================
+
+
+This is the latest stable release of Samba 3.4.
+
+Major enhancements in Samba 3.4.5 include:
+
+   o 
+
+
+######################################################################
+Changes
+#######
+
+Changes since 3.4.4
+-------------------
+
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.4 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older versions follow:
+----------------------------------------
+
+                   =============================
                    Release Notes for Samba 3.4.4
 			 January 7, 2009
                    =============================
@@ -94,8 +139,8 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older versions follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
                    =============================
                    Release Notes for Samba 3.4.3
diff --git a/source3/VERSION b/source3/VERSION
index 594de0f..6110e01 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=4
-SAMBA_VERSION_RELEASE=4
+SAMBA_VERSION_RELEASE=5
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index ffb7dde..14b137b 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -890,6 +890,13 @@ static ssize_t read_from_internal_pipe(struct pipes_struct *p, char *data, size_
   out:
 	(*is_data_outstanding) = prs_offset(&p->out_data.frag) > n;
 
+	if (p->out_data.current_pdu_sent == prs_offset(&p->out_data.frag)) {
+		/* We've returned everything in the out_data.frag
+		 * so we're done with this pdu. Free it and reset
+		 * current_pdu_sent. */
+		p->out_data.current_pdu_sent = 0;
+		prs_mem_free(&p->out_data.frag);
+	}
 	return data_returned;
 }
 
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index 2686cf4..878d171 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -326,6 +326,11 @@ static void pipe_write_andx_done(struct tevent_req *subreq)
 
  done:
 	chain_reply(req);
+	/*
+	 * We must free here as the ownership of req was
+	 * moved to the connection struct in reply_pipe_write_and_X().
+	 */
+	TALLOC_FREE(req);
 }
 
 /****************************************************************************
@@ -431,4 +436,9 @@ static void pipe_read_andx_done(struct tevent_req *subreq)
 
  done:
 	chain_reply(req);
+	/*
+	 * We must free here as the ownership of req was
+	 * moved to the connection struct in reply_pipe_read_and_X().
+	 */
+	TALLOC_FREE(req);
 }


-- 
Samba Shared Repository