From 7ca128e451093b4fd7d62a039b1a1353192e1afa Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@fedoraproject.org>
Date: Sat, 1 May 2010 18:51:28 +0000
Subject: [PATCH] * Sat May 01 2010 Simo Sorce <ssorce@redhat.com> - 3.5.2-60 -
 Fix segfault bug #586511

---
 samba-3.5.2-smbclient-segfault.patch | 22 ++++++++++++++++++++++
 samba.spec                           |  9 ++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 samba-3.5.2-smbclient-segfault.patch

diff --git a/samba-3.5.2-smbclient-segfault.patch b/samba-3.5.2-smbclient-segfault.patch
new file mode 100644
index 0000000..57912db
--- /dev/null
+++ b/samba-3.5.2-smbclient-segfault.patch
@@ -0,0 +1,22 @@
+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);
diff --git a/samba.spec b/samba.spec
index c43589c..57fe3af 100644
--- a/samba.spec
+++ b/samba.spec
@@ -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@redhat.com> - 3.5.2-60
+- Fix segfault bug #586511
+
 * Wed Apr 07 2010 Guenther Deschner <gdeschner@redhat.com> - 3.5.2-59
 - Update to 3.5.2