Forward port KDE SVN r803253 to fix potential security hole

pull/2/head
Timothy Pearson 11 years ago
parent 1312d2b18e
commit c383da9dc6

@ -182,6 +182,7 @@
// ksmserver
#cmakedefine DBUS_SYSTEM_BUS "@DBUS_SYSTEM_BUS@"
#cmakedefine HAVE__ICETRANSNOLISTEN 1
// ksplashml
#cmakedefine HAVE_XINERAMA 1

@ -9,6 +9,8 @@
#
#################################################
include( ConfigureChecks.cmake )
if( NOT DBUS_SYSTEM_BUS )
set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
endif()

@ -0,0 +1,12 @@
#################################################
#
# (C) 2014 Timothy Pearson
# kb9vqf (AT) pearsoncomputing (DOT) net
#
# Improvements and feedback are welcome
#
# This file is released under GPL >= 2
#
#################################################
check_library_exists( ICE _IceTransNoListen "" HAVE__ICETRANSNOLISTEN )

@ -392,9 +392,9 @@ Status SetAuthentication (int count, IceListenObj *listenObjs,
{
KTempFile addAuthFile;
addAuthFile.setAutoDelete(true);
remAuthFile = new KTempFile;
remAuthFile->setAutoDelete(true);
remAuthFile->setAutoDelete(true);
if ((addAuthFile.status() != 0) || (remAuthFile->status() != 0))
return 0;
@ -468,7 +468,7 @@ void FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
tqWarning("[KSMServer] could not find iceauth");
return;
}
TDEProcess p;
p << iceAuth << "source" << remAuthFile->name();
p.start(TDEProcess::Block);
@ -489,7 +489,7 @@ static int Xio_ErrorHandler( Display * )
server->cleanUp();
// Don't delete server!!
}
exit(0); // Don't report error, it's not our fault.
}
@ -854,7 +854,7 @@ void KSMServer::storeSession()
TDEConfig* config = TDEGlobal::config();
config->reparseConfiguration(); // config may have changed in the KControl module
config->setGroup("General" );
excludeApps = TQStringList::split( TQRegExp( "[,:]" ), config->readEntry( "excludeApps" ).lower());
excludeApps = TQStringList::split( TQRegExp( "[,:]" ), config->readEntry( "excludeApps" ).lower());
config->setGroup( sessionGroup );
int count = config->readNumEntry( "count" );
for ( int i = 1; i <= count; i++ ) {

Loading…
Cancel
Save