[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-1-34-g2345901

Karolin Seeger kseeger at samba.org
Thu Aug 14 07:01:25 GMT 2008


The branch, v3-2-stable has been updated
       via  23459016bcc008d04ab4e9c7da0ac0ebb3d4cb8b (commit)
       via  7aef086d4081c13ba5282d083f7d6444ce14cc5b (commit)
       via  3f70595aec14f3bab668d24f647995e4a739863a (commit)
       via  15fe385030dba46dcf9ec9ce36048ec6c1c097bf (commit)
       via  d7df1c203d17c64af43a318c0f95875a02c472b8 (commit)
      from  b4c445fd2439df65839049371d9e9ed6373b9cd7 (commit)

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


- Log -----------------------------------------------------------------
commit 23459016bcc008d04ab4e9c7da0ac0ebb3d4cb8b
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Aug 14 08:52:36 2008 +0200

    WHATSNEW: Update changes since 3.2.1.
    
    Karolin
    (cherry picked from commit 77c25837addde31086151ce174dcbf463b2569f0)

commit 7aef086d4081c13ba5282d083f7d6444ce14cc5b
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Aug 13 16:53:28 2008 -0700

    Fix coverity CID: 594. Resource leak on error path.
    Jeremy.
    (cherry picked from commit dcd28df09538922369cb613ac95c147365e02c42)

commit 3f70595aec14f3bab668d24f647995e4a739863a
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Aug 13 16:46:49 2008 -0700

    Fix for bug #5688 from SATOH Fumiyasu <fumiyas at osstech.co.jp>. LPQ process is orphaned if socket address parameter is invalid.
    If the "socket address" parameter is a null string that is an invalid value for Samba 3.2 but valid for Samba 3.0.
    Jeremy.
    (cherry picked from commit a46dc151f692e6b4bd14d3881f90bca5fe5b9474)

commit 15fe385030dba46dcf9ec9ce36048ec6c1c097bf
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Aug 13 15:48:26 2008 -0700

    Fix for bug #5617, reported and patched by Bartosz Antosik antosik at gmail.com.
    xp/2003 explorer freezes browsing shares on samba ipv6 hosts. Caused by missing
    reply packet to SMB printclose packet.
    Jeremy
    (cherry picked from commit 93c977e80594e20ebd562b1eb8a03d57b9299461)

commit d7df1c203d17c64af43a318c0f95875a02c472b8
Author: Jim McDonough <jmcd at samba.org>
Date:   Wed Aug 13 18:03:51 2008 -0400

    Prevent NT_STATUS 0xF1000000 errors from appearing when
    dos errors are used and there is no error.  It should
    be mapped directly to NT_STATUS_OK.  smbclient to older
    servers didn't work.
    (cherry picked from commit 43054b199cb2a5f12c8e0c2bb14cf2328a945152)

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

Summary of changes:
 WHATSNEW.txt                       |   18 +++++++++++++++++-
 source/libsmb/async_smb.c          |    6 ++++++
 source/rpc_server/srv_spoolss_nt.c |    6 ++++--
 source/smbd/reply.c                |    2 ++
 source/smbd/server.c               |    3 ++-
 5 files changed, 31 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index a10605a..012a1fe 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -3,7 +3,7 @@
 
                    ==============================
 
-This is the third stable release of Samba 3.2.
+This is a bug fix release of the Samba 3.2 series.
 
 Major bug fixes included in Samba 3.2.2 are:
 
@@ -11,6 +11,8 @@ Major bug fixes included in Samba 3.2.2 are:
     tdb files and to overflowing partitions as a consequence on systems
     running an nmbd daemon.
 
+  o Fix freezing Windows Explorer on WinXP while browsing Samba shares.
+
 
 ######################################################################
 Changes
@@ -31,9 +33,15 @@ o   Jeremy Allison <jra at samba.org>
     * BUG 5675: Fix smbspool program assuming Kerberos authentication by
       mistake.
     * BUG 5686: Fix segfaults in libsmbclient.
+    * Fix coverity ID 594 (resource leak on error path).
     * Several build fixes.
 
 
+o   Bartosz Antosik <antosik at gmail.com>
+    * BUG #5617: Fix freezing Windows Explorer on WinXP while browsing
+      Samba shares.
+
+
 o   Andrew Bartlett <abartlet at samba.org>
     * Include stdlib.h to get a prototype for free().
 
@@ -50,6 +58,10 @@ o   Günther Deschner <gd at samba.org>
     * Add add c++ guard to netapi.
 
 
+o   SATOH Fumiyasu <fumiyas at osstech.co.jp>
+    * BUG 5688: Fix orphaned LPQ processes if socket address is invalid.
+
+
 o   Volker Lendecke <vl at samba.org>
     * BUG 5684: Fix removal of dead records in tdb files.
     * Fix smb_len calculation for chained requests.
@@ -59,6 +71,10 @@ o   Herb Lewis <herb at samba.org>
     * Fix output of test status.
 
 
+o   Jim McDonough <jmcd at samba.org>
+    * Fix smbclient connections to older servers.
+
+
 o   Andrew Tridgell <tridge at samba.org>
     * Fix a fd leak when trying to regain contact to a domain controller
       in Winbind.
diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c
index 04c22a9..58bba2b 100644
--- a/source/libsmb/async_smb.c
+++ b/source/libsmb/async_smb.c
@@ -31,6 +31,12 @@ NTSTATUS cli_pull_error(char *buf)
 		return NT_STATUS(IVAL(buf, smb_rcls));
 	}
 
+	/* if the client uses dos errors, but there is no error,
+	   we should return no error here, otherwise it looks
+	   like an unknown bad NT_STATUS. jmcd */
+	if (CVAL(buf, smb_rcls) == 0)
+		return NT_STATUS_OK;
+
 	return NT_STATUS_DOS(CVAL(buf, smb_rcls), SVAL(buf,smb_err));
 }
 
diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index cc7807d..92f68ea 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -5037,8 +5037,10 @@ static WERROR getprinter_level_7(Printer_entry *print_hnd, int snum, RPC_BUFFER
 	if((printer=SMB_MALLOC_P(PRINTER_INFO_7))==NULL)
 		return WERR_NOMEM;
 
-	if (!construct_printer_info_7(print_hnd, printer, snum))
-		return WERR_NOMEM;
+	if (!construct_printer_info_7(print_hnd, printer, snum)) {
+		result = WERR_NOMEM;
+		goto out;
+	}
 
 	/* check the required size. */
 	*needed += spoolss_size_printer_info_7(printer);
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index ef49d58..88c8ae8 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -4672,6 +4672,8 @@ void reply_printclose(struct smb_request *req)
 		return;
 	}
 
+	reply_outbuf(req, 0, 0);
+
 	END_PROFILE(SMBsplclose);
 	return;
 }
diff --git a/source/smbd/server.c b/source/smbd/server.c
index 035469c..176cd5f 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -465,7 +465,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
 		char *sock_tok;
 		const char *sock_ptr;
 
-		if (strequal(sock_addr, "0.0.0.0") ||
+		if (sock_addr[0] == '\0' ||
+				strequal(sock_addr, "0.0.0.0") ||
 				strequal(sock_addr, "::")) {
 #if HAVE_IPV6
 			sock_addr = "::,0.0.0.0";


-- 
Samba Shared Repository


More information about the samba-cvs mailing list