rpms/kdebase/devel kdebase-3.5.4-kdm.patch, NONE, 1.1 kdebase.spec, 1.218, 1.219

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21856

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.4-kdm.patch 
Log Message:
- fix kdm crash



kdebase-3.5.4-kdm.patch:
 choose.c |    3 ++-
 ctrl.c   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kdebase-3.5.4-kdm.patch ---
Index: kdm/backend/ctrl.c
===================================================================
--- kdm/backend/ctrl.c	(Revision 574587)
+++ kdm/backend/ctrl.c	(Revision 574588)
@@ -842,7 +842,7 @@
 					break;
 				case remoteLogin:
 					if (di->serverPid != -1 && nuke)
-						TerminateProcess( di->serverPid, d->termSignal );
+						TerminateProcess( di->serverPid, di->termSignal );
 					break;
 				case reserve:
 					di->status = notRunning;
Index: kdm/backend/choose.c
===================================================================
--- kdm/backend/choose.c	(Revision 574623)
+++ kdm/backend/choose.c	(Revision 574624)
@@ -83,7 +83,8 @@
 		if (XdmcpARRAY8Equal( clientAddress, &i->client ) &&
 		    connectionType == i->connectionType)
 			return 1;
-	i = (IndirectUsersPtr)Malloc( sizeof(IndirectUsersRec) );
+	if (!(i = (IndirectUsersPtr)Malloc( sizeof(IndirectUsersRec) )))
+		return 0;
 	if (!XdmcpCopyARRAY8( clientAddress, &i->client )) {
 		free( (char *)i );
 		return 0;


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- kdebase.spec	25 Aug 2006 12:16:36 -0000	1.218
+++ kdebase.spec	25 Aug 2006 12:26:37 -0000	1.219
@@ -61,6 +61,7 @@
 Patch102: kdebase-3.5.4-kde#124116.patch
 Patch103: kdebase-3.5.4-konsole-bz#203221.patch
 Patch104: kdebase-3.5.4-kde#132873.patch
+Patch105: kdebase-3.5.4-kdm.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: libxml2 >= 2.6.5
@@ -174,6 +175,7 @@
 %patch102 -p0 -b .kde#124116
 %patch103 -p0 -b .bz#203221
 %patch104 -p0 -b .kde#132873
+%patch105 -p0 -b .kdm-crash
 
 %if %{rhel}
    rm -rf kdeprint/kdeprintfax
@@ -548,6 +550,7 @@
 - fix #203279, antialiasing issue
 - apply upstream patch to fix kdedesktop crash, kde#132873
 - fix #201507, pam config issue
+- fix kdm crash
 
 * Mon Aug 21 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - fix #203221, konsole does not display bold characters