rpms/samba/F-12 samba-3.4.4-libsmbclient.patch, NONE, 1.1 samba.spec, 1.203, 1.204

[Guenther Deschner]

Author: gd

Update of /cvs/pkgs/rpms/samba/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32077

Modified Files:
	samba.spec 
Added Files:
	samba-3.4.4-libsmbclient.patch 
Log Message:
Fix crash bug in libsmbclient (SMBC_parse_path)
resolves: #552658

Guenther



samba-3.4.4-libsmbclient.patch:
 libsmb_path.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE samba-3.4.4-libsmbclient.patch ---
>From 35d55bf0f02fe6496b23e7bf692213421cecad4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd at samba.org>
Date: Thu, 14 Jan 2010 19:34:26 +0100
Subject: [PATCH] s3-libsmbclient: Fix crash bug in SMBC_parse_path().

Patch from Tim Waugh <twaugh at redhat.com>.
This resolves https://bugzilla.redhat.com/show_bug.cgi?id=552658

LIBSMBCLIENT-OPENDIR torture test checks this as well.

Guenther
(cherry picked from commit e635b0074c55e0376495abe940355aa7b04f0b70)
---
 source3/libsmb/libsmb_path.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c
index 6a59a12..511d54e 100644
--- a/source3/libsmb/libsmb_path.c
+++ b/source3/libsmb/libsmb_path.c
@@ -308,7 +308,7 @@ SMBC_parse_path(TALLOC_CTX *ctx,
 		if (!*pp_server) {
 			return -1;
 		}
-               	*pp_server[wl] = '\0';
+		(*pp_server)[wl] = '\0';
 		return 0;
 	}
         
-- 
1.6.5.2



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/samba.spec,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -p -r1.203 -r1.204
--- samba.spec	7 Jan 2010 11:10:30 -0000	1.203
+++ samba.spec	14 Jan 2010 19:04:50 -0000	1.204
@@ -1,4 +1,4 @@
-%define main_release 51
+%define main_release 52
 %define samba_version 3.4.4
 %define tdb_version 1.1.3
 %define talloc_version 1.3.0
@@ -45,6 +45,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosnam
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
+Patch201: samba-3.4.4-libsmbclient.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -202,6 +203,7 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
+%patch201 -p1 -b .libsmbclient
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -654,6 +656,10 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Thu Jan 14 2010 Guenther Deschner <gdeschner at redhat.com> - 3.4.4-52
+- Fix crash bug in libsmbclient (SMBC_parse_path)
+- resolves: #552658
+
 * Thu Jan 07 2010 Guenther Deschner <gdeschner at redhat.com> - 3.4.4-51
 - Update to 3.4.4