rpms/samba/F-9 samba-3.2.0rc1-server.diff, NONE, 1.1 samba.spec, 1.155, 1.156

[Guenther Deschner (gd)]

Author: gd

Update of /cvs/pkgs/rpms/samba/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3558

Modified Files:
	samba.spec 
Added Files:
	samba-3.2.0rc1-server.diff 
Log Message:
Fix security=server
resolves: #449038, #449039

Guenther


samba-3.2.0rc1-server.diff:

--- NEW FILE samba-3.2.0rc1-server.diff ---
commit 779a3af0cd3ecbf82e3de16a4e0aec046c19d869
Author: Volker Lendecke <vl at samba.org>
Date:   Fri May 30 11:46:34 2008 +0200

    Fix security=server, bug 5502
    
    This has brown paper bag quality and is definitely needed for 3.2.0.
    
    Thanks to Orion Poplawski for reporting this!
    
    Volker

diff --git a/source/auth/auth_server.c b/source/auth/auth_server.c
index b07884c..31d1d37 100644
--- a/source/auth/auth_server.c
+++ b/source/auth/auth_server.c
@@ -270,13 +270,15 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context
 					 const auth_usersupplied_info *user_info, 
 					 auth_serversupplied_info **server_info)
 {
+	struct server_security_state *state = talloc_get_type_abort(
+		my_private_data, struct server_security_state);
 	struct cli_state *cli;
 	static bool tested_password_server = False;
 	static bool bad_password_server = False;
 	NTSTATUS nt_status = NT_STATUS_NOT_IMPLEMENTED;
 	bool locally_made_cli = False;
 
-	cli = (struct cli_state *)my_private_data;
+	cli = state->cli;
 	
 	if (cli) {
 	} else {
@@ -285,7 +287,7 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context
 	}
 
 	if (!cli || !cli->initialised) {
-		DEBUG(1,("password server is not connected (cli not initilised)\n"));
+		DEBUG(1,("password server is not connected (cli not initialised)\n"));
 		return NT_STATUS_LOGON_FAILURE;
 	}  
 	


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- samba.spec	28 May 2008 13:33:09 -0000	1.155
+++ samba.spec	30 May 2008 10:33:35 -0000	1.156
@@ -1,4 +1,4 @@
-%define main_release 14
+%define main_release 15
 %define samba_version 3.2.0rc1
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
@@ -48,6 +48,7 @@
 Patch200: samba-3.0.25rc1-inotifiy.patch
 Patch220: samba-3.2.0rc1-capget.diff
 Patch221: samba-CVE-2008-1105.diff
+Patch222: samba-3.2.0rc1-server.diff
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -256,6 +257,7 @@
 #%patch200 -p0 -b .inotify # FIXME: does not compile
 %patch220 -p1 -b .capget
 %patch221 -p1 -b .CVE-2008-1105
+%patch222 -p1 -b .server
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION
@@ -850,6 +852,10 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Fri May 30 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.0-1.rc1.15
+- Fix security=server
+- resolves: #449038, #449039
+
 * Wed May 28 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.0-1.rc1.14
 - Add fix for CVE-2008-1105
 - resolves: #446724