kdebase 3.4 - xdmcp fix

[Patryk Szczygłowski]

- "kdm segfaults on XDMCP request" fix
(http://bugs.kde.org/show_bug.cgi?id=114385)
- rel 3
- STBR

-- 
Patryk Szczygłowski
patryk at patryk.one.pl
JID: psz at chrome.pl
-------------- next part --------------
--- kdebase.spec.old	2005-10-30 13:21:49.000000000 +0100
+++ kdebase.spec	2005-12-09 04:07:41.000000000 +0100
@@ -27,7 +27,7 @@
 Summary(zh_CN):	KDEşËĐÄ
 Name:		kdebase
 Version:	%{_ver}
-Release:	2
+Release:	3
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -70,6 +70,7 @@
 Patch19:	%{name}-konsole-default-keytab.patch
 Patch20:	%{name}-seesar.patch
 Patch21:	%{name}-konsole-wordseps.patch
+Patch22:	%{name}-xdmcp.patch
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	audiofile-devel
@@ -1048,6 +1049,7 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 cd kcontrol/ebrowsing/plugins/ikws/searchproviders
 for i in  google*.desktop
-------------- next part --------------
--- kdebase-orig/kdm/backend/xdmcp.c	2005-12-08 21:31:57.000000000 +0100
+++ kdebase-3.4.3/kdm/backend/xdmcp.c	2005-12-08 21:37:54.000000000 +0100
@@ -940,7 +940,14 @@
 			}
 			DisposeProtoDisplay( pdpy );
 			Debug( "starting display %s,%s\n", d->name, d->class2 );
-			StartDisplay( d );
+			if (d->status == notRunning)
+				if (LoadDisplayResources( d ) < 0 ) {
+					LogError( "Unable to read configuration for display %s; "
+							"stopping it.\n", d->name );
+					StopDisplay( d );
+				}
+				else
+					StartDisplay( d );
 			CloseGetter();
 		}
 	}