From b75d0e1b54ef2bfaa382a5235378b047d8440829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Tue, 10 Dec 2013 17:00:29 +0100 Subject: [PATCH] Fix winbind debug message NULL pointer derreference. resolves: #1019469 Guenther --- samba-4.1.3-winbind_debug.patch | 37 +++++++++++++++++++++++++++++++++ samba.spec | 7 ++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 samba-4.1.3-winbind_debug.patch diff --git a/samba-4.1.3-winbind_debug.patch b/samba-4.1.3-winbind_debug.patch new file mode 100644 index 0000000..714be1b --- /dev/null +++ b/samba-4.1.3-winbind_debug.patch @@ -0,0 +1,37 @@ +From 967f9bd1f8a147c4b89ada3b6c7e1ce064c511bc Mon Sep 17 00:00:00 2001 +From: Jan Brummer +Date: Mon, 9 Dec 2013 15:22:29 +0100 +Subject: [PATCH] s3-winbindd: Fix DEBUG statement in winbind_msg_offline(). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=10285 + +Reviewed-by: Günther Deschner +Reviewed-by: Andreas Schneider + +Autobuild-User(master): Günther Deschner +Autobuild-Date(master): Mon Dec 9 17:28:37 CET 2013 on sn-devel-104 +--- + source3/winbindd/winbindd_dual.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c +index 972924c..64af571 100644 +--- a/source3/winbindd/winbindd_dual.c ++++ b/source3/winbindd/winbindd_dual.c +@@ -626,7 +626,7 @@ void winbind_msg_offline(struct messaging_context *msg_ctx, + we only set it online / offline for that domain. */ + + DEBUG(10,("winbind_msg_offline: sending message to pid %u for domain %s.\n", +- (unsigned int)child->pid, domain->name )); ++ (unsigned int)child->pid, child->domain->name )); + + messaging_send_buf(msg_ctx, pid_to_procid(child->pid), + MSG_WINBIND_OFFLINE, +-- +1.8.3.1 + diff --git a/samba.spec b/samba.spec index 43aa392..0733da5 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # Set --with testsuite or %bcond_without to run the Samba torture testsuite. %bcond_with testsuite -%define main_release 1 +%define main_release 2 %define samba_version 4.1.3 %define talloc_version 2.0.8 @@ -87,6 +87,7 @@ Source201: README.downgrade Patch0: samba-4.1.0-upn.patch Patch1: samba-4.1.2-doc.patch +Patch2: samba-4.1.3-winbind_debug.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -491,6 +492,7 @@ module necessary to communicate to the Winbind Daemon %patch0 -p1 -b .samba-4.1.0-upn.patch %patch1 -p1 -b .samba-4.1.2-doc.patch +%patch2 -p1 -b .samba-4.1.3-winbind_debug.patch %build %global _talloc_lib ,talloc,pytalloc,pytalloc-util @@ -1543,6 +1545,9 @@ rm -rf %{buildroot} %{_mandir}/man8/pam_winbind.8* %changelog +* Wed Dec 10 2013 - Guenther Deschner - 4.1.3-2 +- resolves: #1019469 - Fix winbind debug message NULL pointer derreference. + * Mon Dec 09 2013 - Andreas Schneider - 4.1.3-1 - Update to Samba 4.1.3. - resolves: #1039454 - CVE-2013-4408.