summaryrefslogtreecommitdiffstats
path: root/ksmserver/server.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-05-19 23:17:42 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-05-19 23:17:42 -0500
commitc383da9dc680e5e79e75b84003eca7bfa08dd991 (patch)
tree7e28cb40a4e6b8c8d5acab37af4cbfd3c69650e2 /ksmserver/server.cpp
parent1312d2b18e2bdf7a8759e0c43edf90a584ac622a (diff)
downloadtdebase-c383da9dc680e5e79e75b84003eca7bfa08dd991.tar.gz
tdebase-c383da9dc680e5e79e75b84003eca7bfa08dd991.zip
Forward port KDE SVN r803253 to fix potential security hole
Diffstat (limited to 'ksmserver/server.cpp')
-rw-r--r--ksmserver/server.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index c63d70d76..1d98bc0a6 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -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++ ) {