rpms/kdebase-workspace/devel kdebase-workspace-4.0.98-consolekit-kdm.patch, 1.2, 1.3

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29214/devel

Modified Files:
	kdebase-workspace-4.0.98-consolekit-kdm.patch 
Log Message:
Fix probable segfault and simplify code a bit.

kdebase-workspace-4.0.98-consolekit-kdm.patch:

Index: kdebase-workspace-4.0.98-consolekit-kdm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.98-consolekit-kdm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-workspace-4.0.98-consolekit-kdm.patch	15 Jul 2008 01:33:04 -0000	1.2
+++ kdebase-workspace-4.0.98-consolekit-kdm.patch	15 Jul 2008 02:34:25 -0000	1.3
@@ -161,7 +161,7 @@
  int readDmrc( void );
 diff -Nur kdebase-workspace-4.0.98/kdm/backend/session.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c
 --- kdebase-workspace-4.0.98/kdm/backend/session.c	2008-01-05 00:55:44.000000000 +0100
-+++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c	2008-07-15 03:18:06.000000000 +0200
++++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c	2008-07-15 04:29:13.000000000 +0200
 @@ -45,6 +45,14 @@
  #include <ctype.h>
  #include <signal.h>
@@ -187,16 +187,16 @@
 +	char *ck_session_cookie;
 +	struct passwd *pwent;
 +	char device[20] = "";
++	dbus_bool_t is_local;
 +#ifdef XDMCP
-+	char *empty_hostname = "";
-+	char **remote_host_name;
++	char *remote_host_name = "";
 +#endif
 +#endif
 +
  	td = d;
  	debug( "manageSession %s\n", d->name );
  	if ((ex = Setjmp( abortSession ))) {
-@@ -628,7 +648,58 @@
+@@ -628,7 +648,57 @@
  	if (td_setup)
  		setupDisplay( td_setup );
  
@@ -214,22 +214,21 @@
 +		ck_session_cookie = NULL;
 +	} else {
 +		connector = ck_connector_new ();
++		if (connector != NULL) {
++			is_local = ((d->displayType & d_location) == dLocal);
 +#ifdef XDMCP
-+		if ((d->displayType & d_location) != dLocal && d->remoteHost)
-+			remote_host_name = &(d->remoteHost);
-+		else
-+			remote_host_name = &empty_hostname;
++			if (!is_local && d->remoteHost)
++				remote_host_name = d->remoteHost;
 +#endif
-+	
-+		if (connector != NULL) {
++
 +			dbus_error_init (&error);
 +			if ( !(ck_connector_open_session_with_parameters (connector,
-+				&error, "unix-user", &(pwent->pw_uid), 
++				&error, "unix-user", &(pwent->pw_uid),
 +				"display-device", &device,
 +				"x11-display", &(d->name),
-+				"is-local", ((d->displayType & d_location) == dLocal),
++				"is-local", &is_local,
 +#ifdef XDMCP
-+				"remote-host-name", remote_host_name,			
++				"remote-host-name", &remote_host_name,
 +#endif
 +				NULL))) {
 +				if (dbus_error_is_set (&error)) {
@@ -255,7 +254,7 @@
  		logError( "Client start failed\n" );
  		sessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */
  	}
-@@ -650,6 +721,23 @@
+@@ -650,6 +720,23 @@
  				catchTerm( SIGTERM );
  		}
  	}