rpms
/
samba
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Sat May 01 2010 Simo Sorce <ssorce@redhat.com> - 3.5.2-60 

- Fix segfault bug #586511
This commit is contained in:
Simo Sorce 2010-05-01 18:51:28 +00:00
parent e305e4f90a
commit 7ca128e451
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
samba-3.5.2-smbclient-segfault.patch Normal file
View File

@ -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);

9
samba.spec
View File

@ -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