summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-07-03 11:10:17 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2018-07-03 11:11:06 (GMT)
commita359fef24e132b22b7a1667f826b0fb1bddf331f (patch)
treee0e40b2a64d576331c926aedfeb019b733fd94c2
parent828bd2ad0c9d07fcbef8cc5ef113e19882cbe3d4 (diff)
downloadtdebase-a359fef2.zip
tdebase-a359fef2.tar.gz
Fixed session locking at login. This resolves bug 2874.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--kdesktop/CMakeLists.txt2
-rw-r--r--kdesktop/lockeng.cc26
-rwxr-xr-xstarttde12
3 files changed, 28 insertions, 12 deletions
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 45cc9e9..fcb84a6 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -81,6 +81,8 @@ tde_add_executable( kxdglauncher
##### kdesktop (tdeinit) ########################
set( target kdesktop )
+set_source_files_properties( lockeng.cc PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
+
set( ${target}_SRCS
main.cc krootwm.cc xautolock.cc kdiconview.cc init.cc
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index 8aa6bb6..4683ad4 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -10,6 +10,7 @@
#include <config.h>
#include <stdlib.h>
+#include <sys/stat.h>
#include <ksslcertificate.h>
@@ -19,6 +20,7 @@
#include <kstandarddirs.h>
#include <tdeapplication.h>
#include <kservicegroup.h>
+#include <ksimpleconfig.h>
#include <kdebug.h>
#include <kuser.h>
#include <tdelocale.h>
@@ -165,6 +167,30 @@ SaverEngine::SaverEngine()
sigaddset(&mThreadBlockSet, SIGTTIN);
pthread_sigmask(SIG_BLOCK, &mThreadBlockSet, NULL);
+ // Wait for the saver process to signal ready...
+ if (!waitForLockProcessStart()) {
+ kdDebug( 1204 ) << "Failed to initialize kdesktop_lock (unexpected termination)!" << endl;
+ }
+
+ // lock the desktop if required
+ KSimpleConfig *config;
+ struct stat st;
+ if (stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st) == 0) {
+ config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+ }
+ else {
+ config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+ }
+ config->setGroup("X-:0-Core");
+ bool autoLoginEnable = config->readBoolEntry("AutoLoginEnable", false);
+ bool autoLoginLocked = config->readBoolEntry("AutoLoginLocked", false);
+ if (autoLoginEnable && autoLoginLocked) {
+ mLockProcess.kill(SIGTTOU);
+ mLockProcess.kill(SIGUSR1);
+ }
+ delete config;
+ config = NULL;
+
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
diff --git a/starttde b/starttde
index c237652..ba025d8 100755
--- a/starttde
+++ b/starttde
@@ -745,18 +745,6 @@ if test $? -ne 0; then
fi
echo "[starttde] tdeinit started successfully." 1>&2
-# If the session should be locked from the start (locked autologin),
-# lock now and do the rest of the TDE startup underneath the locker.
-# FIXME
-# kdesktop needs to be notified of this locker process somehow so that
-# it does not attempt to launch its own locker process on startup!
-if test -n "$dl"; then
- $TDEDIR/bin/kwrapper kdesktop_lock --forcelock &
- # Give it some time for starting up. This is somewhat unclean; some
- # notification would be better.
- sleep 1
-fi
-
# Finally, give the session control to the session manager.
# See tdebase/ksmserver for the description of the rest of the startup sequence.
# When set, the TDEWM environment variable will be used as Trinity's