rpms/samba/F-12 samba-3.3.5-schannel_pipe.patch, NONE, 1.1 samba.spec, 1.201, 1.202

[Guenther Deschner]

Author: gd

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

Modified Files:
	samba.spec 
Added Files:
	samba-3.3.5-schannel_pipe.patch 
Log Message:
Fix uninitialized rpc client pipe, causing winbind to crash
resolves: #541328

Guenther


samba-3.3.5-schannel_pipe.patch:
 cli_pipe.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE samba-3.3.5-schannel_pipe.patch ---
>From bc0dc5a452f52df76d3f6bbd119acd8476afe9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd at samba.org>
Date: Tue, 10 Nov 2009 13:10:12 +0100
Subject: [PATCH] s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.

Guenther
(cherry picked from commit d241b9ae4c9b520406aac98e24d078f2d4fd4ae5)
---
 source3/rpc_client/cli_pipe.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 9ff84f8..28d9d99 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -4123,6 +4123,8 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli,
 	struct rpc_pipe_client *result = NULL;
 	NTSTATUS status;
 
+	*presult = NULL;
+
 	status = get_schannel_session_key(cli, domain, &neg_flags,
 					  &netlogon_pipe);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -4143,7 +4145,7 @@ NTSTATUS cli_rpc_pipe_open_schannel(struct cli_state *cli,
 		*presult = result;
 	}
 
-	return NT_STATUS_OK;
+	return status;
 }
 
 /****************************************************************************
-- 
1.6.5.2



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-12/samba.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- samba.spec	25 Nov 2009 14:56:15 -0000	1.201
+++ samba.spec	1 Dec 2009 17:40:37 -0000	1.202
@@ -1,4 +1,4 @@
-%define main_release 49
+%define main_release 50
 %define samba_version 3.4.3
 %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.3.5-schannel_pipe.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 .schannel_pipe
 
 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
+* Tue Dec 01 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-50
+- Fix uninitialized rpc client pipe, causing winbind to crash
+- resolves: #541328
+
 * Wed Nov 25 2009 Guenther Deschner <gdeschner at redhat.com> - 3.4.3-49
 - Various updates to inline documentation in default smb.conf file
 - resolves: #483703