rpms/samba/F-13 samba-3.5.2-smbclient-segfault.patch, NONE, 1.1 samba.spec, 1.213, 1.214

[Simo Sorce]

Author: simo

Update of /cvs/pkgs/rpms/samba/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11209

Modified Files:
	samba.spec 
Added Files:
	samba-3.5.2-smbclient-segfault.patch 
Log Message:
* Sat May 01 2010 Simo Sorce <ssorce at redhat.com> - 3.5.2-60
- Fix segfault bug #586511


samba-3.5.2-smbclient-segfault.patch:
 cliconnect.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE samba-3.5.2-smbclient-segfault.patch ---
diff -uPr samba-3.5.2.orig/source3/libsmb/cliconnect.c samba-3.5.2/source3/libsmb/cliconnect.c
--- samba-3.5.2.orig/source3/libsmb/cliconnect.c	2010-04-01 09:26:22.000000000 -0400
+++ samba-3.5.2/source3/libsmb/cliconnect.c	2010-05-01 14:05:58.171965275 -0400
@@ -1320,6 +1320,8 @@
 	char *tmp = NULL;
 	uint8_t *bytes;
 
+	*psmbreq = NULL;
+
 	req = tevent_req_create(mem_ctx, &state, struct cli_tcon_andx_state);
 	if (req == NULL) {
 		return NULL;
@@ -1455,6 +1457,9 @@
 	if (req == NULL) {
 		return NULL;
 	}
+	if (subreq == NULL) {
+		return req;
+	}
 	status = cli_smb_req_send(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		tevent_req_nterror(req, status);


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-13/samba.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -p -r1.213 -r1.214
--- samba.spec	7 Apr 2010 09:17:49 -0000	1.213
+++ samba.spec	1 May 2010 18:51:28 -0000	1.214
@@ -1,4 +1,4 @@
-%define main_release 59
+%define main_release 60
 %define samba_version 3.5.2
 %define tdb_version 1.2.1
 %define talloc_version 2.0.1
@@ -37,7 +37,7 @@ Source999: filter-requires-samba.sh
 
 # upstream patches.  Applied first so that they'll break our patches rather
 # than the other way around
-# (none right now)
+Patch01: samba-3.5.2-smbclient-segfault.patch
 
 # generic patches
 Patch102: samba-3.2.0pre1-pipedir.patch
@@ -194,7 +194,7 @@ cp %{SOURCE10} packaging/Fedora/
 cp %{SOURCE11} packaging/Fedora/
 
 # Upstream patches
-#(none)
+%patch01 -p1 -b .smbclient_segfault
 # generic patches
 %patch102 -p1 -b .pipedir
 #%patch103 -p1 -b .logfiles
@@ -650,6 +650,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Sat May 01 2010 Simo Sorce <ssorce at redhat.com> - 3.5.2-60
+- Fix segfault bug #586511
+
 * Wed Apr 07 2010 Guenther Deschner <gdeschner at redhat.com> - 3.5.2-59
 - Update to 3.5.2