DilOS tdebase: Modify the DilOS specific patch for a stable branch.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/92/head
Slávek Banko 5 years ago
parent 54987baa29
commit cac18135ca
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -214,209 +214,6 @@ Index: tdebase/kicker/extensions/kasbar/kasloaditem.cpp
#include <sys/loadavg.h> // e.g. Solaris #include <sys/loadavg.h> // e.g. Solaris
#endif #endif
Index: tdebase/kdesktop/lockeng.cc
===================================================================
--- tdebase.orig/kdesktop/lockeng.cc
+++ tdebase/kdesktop/lockeng.cc
@@ -14,8 +14,10 @@
#include <ksslcertificate.h>
+#ifndef __dilos__
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
+#endif /* __dilos__ */
#include <kstandarddirs.h>
#include <tdeapplication.h>
@@ -198,6 +200,7 @@ SaverEngine::SaverEngine()
delete config;
config = NULL;
+#ifndef __dilos__
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -208,6 +211,7 @@ SaverEngine::SaverEngine()
connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
cdevice->enableCardMonitoring(true);
}
+#endif /* __dilos__ */
// Check card login status
KUser userinfo;
@@ -262,6 +266,7 @@ void SaverEngine::cardStartupTimeout() {
void SaverEngine::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
TQString login_name = TQString::null;
+#ifndef __dilos__
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
KSSLCertificate* card_cert = NULL;
@@ -275,6 +280,7 @@ void SaverEngine::cryptographicCardInser
}
delete card_cert;
}
+#endif /* __dilos__ */
if (login_name != "") {
KUser user;
Index: tdebase/kdesktop/lock/lockprocess.h
===================================================================
--- tdebase.orig/kdesktop/lock/lockprocess.h
+++ tdebase/kdesktop/lock/lockprocess.h
@@ -12,8 +12,12 @@
#include <ksslcertificate.h>
+#ifdef __dilos__
+typedef void TDECryptographicCardDevice;
+#else /* !__dilos__ */
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
+#endif /* __dilos__ */
#include <kgreeterplugin.h>
@@ -267,7 +271,9 @@ class LockProcess : public TQWidget
int m_dialogPrevY;
bool m_notifyReadyRequested;
+#ifndef __dilos__
TDECryptographicCardDevice* m_loginCardDevice;
+#endif /* __dilos__ */
TQWidget* m_maskWidget;
Window m_saverRootWindow;
Index: tdebase/kdesktop/lock/lockprocess.cc
===================================================================
--- tdebase.orig/kdesktop/lock/lockprocess.cc
+++ tdebase/kdesktop/lock/lockprocess.cc
@@ -225,7 +225,9 @@ LockProcess::LockProcess()
m_dialogPrevX(0),
m_dialogPrevY(0),
m_notifyReadyRequested(false),
+#ifndef __dilos__
m_loginCardDevice(NULL),
+#endif /* __dilos__ */
m_maskWidget(NULL),
m_saverRootWindow(0)
{
@@ -291,6 +293,7 @@ LockProcess::LockProcess()
}
}
+#ifndef __dilos__
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -303,6 +306,7 @@ LockProcess::LockProcess()
cdevice->enableCardMonitoring(true);
// cdevice->enablePINEntryCallbacks(true);
}
+#endif /* __dilos__ */
#ifdef KEEP_MOUSE_UNGRABBED
setEnabled(false);
@@ -2824,6 +2828,7 @@ void LockProcess::processInputPipeComman
void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
TQString login_name = TQString::null;
+#ifndef __dilos__
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
KSSLCertificate* card_cert = NULL;
@@ -2837,12 +2842,15 @@ void LockProcess::cryptographicCardInser
}
delete card_cert;
}
+#endif /* __dilos__ */
if (login_name != "") {
KUser user;
if (login_name == user.loginName()) {
// Pass login to the PAM stack...
+#ifndef __dilos__
m_loginCardDevice = cdevice;
+#endif /* __dilos__ */
if (dynamic_cast<SAKDlg*>(currentDialog)) {
dynamic_cast<SAKDlg*>(currentDialog)->closeDialogForced();
TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
@@ -2864,18 +2872,28 @@ void LockProcess::cryptographicCardRemov
passDlg->resetCardLogin();
}
else {
+#ifndef __dilos__
m_loginCardDevice = NULL;
+#endif /* __dilos__ */
TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort()));
}
}
void LockProcess::signalPassDlgToAttemptCardLogin() {
PasswordDlg* passDlg = dynamic_cast<PasswordDlg*>(currentDialog);
- if (passDlg && m_loginCardDevice) {
+ if (passDlg
+#ifndef __dilos__
+ && m_loginCardDevice
+#endif /* __dilos__ */
+ ) {
passDlg->attemptCardLogin();
}
else {
- if (currentDialog && m_loginCardDevice) {
+ if (currentDialog
+#ifndef __dilos__
+ && m_loginCardDevice
+#endif /* __dilos__ */
+ ) {
// Try again later
TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin()));
}
@@ -2904,6 +2922,7 @@ void LockProcess::cryptographicCardPinRe
qryDlg.setUnlockIcon();
mForceReject = false;
execDialog(&qryDlg);
+#ifndef __dilos__
if (mForceReject == false) {
pin_entry = qryDlg.getEntry();
cdevice->setProvidedPin(pin_entry);
@@ -2911,10 +2930,15 @@ void LockProcess::cryptographicCardPinRe
else {
cdevice->setProvidedPin(TQString::null);
}
+#endif /* __dilos__ */
}
TDECryptographicCardDevice* LockProcess::cryptographicCardDevice() {
+#ifdef __dilos__
+ return nullptr;
+#else /* !__dilos__ */
return m_loginCardDevice;
+#endif /* __dilos__ */
}
void LockProcess::fullyOnline() {
Index: tdebase/kdesktop/lock/lockdlg.cc
===================================================================
--- tdebase.orig/kdesktop/lock/lockdlg.cc
+++ tdebase/kdesktop/lock/lockdlg.cc
@@ -558,6 +558,7 @@ void PasswordDlg::handleVerify()
// Check if cryptographic card login is being used
if (mCardLoginInProgress) {
// Attempt authentication if configured
+#ifndef __dilos__
TDECryptographicCardDevice* cdevice = static_cast<LockProcess*>(parent())->cryptographicCardDevice();
if (cdevice) {
TQString autoPIN = cdevice->autoPIN();
@@ -566,6 +567,7 @@ void PasswordDlg::handleVerify()
TQTimer::singleShot(0, this, SLOT(slotOK()));
}
}
+#endif /* __dilos__ */
mCardLoginInProgress = false;
}
}
Index: tdebase/tdesu/tdesud/tdesud.cpp Index: tdebase/tdesu/tdesud/tdesud.cpp
=================================================================== ===================================================================
--- tdebase.orig/tdesu/tdesud/tdesud.cpp --- tdebase.orig/tdesu/tdesud/tdesud.cpp
@ -452,130 +249,6 @@ Index: tdebase/tdm/backend/getfd.c
return arg; return arg;
#else #else
return (ioctl(fd, KDGKBTYPE, &arg) == 0 return (ioctl(fd, KDGKBTYPE, &arg) == 0
Index: tdebase/tdm/kfrontend/kgverify.cpp
===================================================================
--- tdebase.orig/tdm/kfrontend/kgverify.cpp
+++ tdebase/tdm/kfrontend/kgverify.cpp
@@ -34,8 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <ksslcertificate.h>
+#ifndef __dilos__
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
+#endif /* __dilos__ */
#include <tdeapplication.h>
#include <tdelocale.h>
@@ -665,12 +667,14 @@ KGVerify::handleVerify()
inGreeterPlugin = !ndelay;
if (cardLoginInProgress) {
+#ifndef __dilos__
TQString autoPIN = cardLoginDevice->autoPIN();
if (autoPIN != TQString::null) {
// Initiate login
setPassword(autoPIN);
accept();
}
+#endif /* __dilos__ */
cardLoginInProgress = false;
}
}
Index: tdebase/tdm/kfrontend/kgreeter.cpp
===================================================================
--- tdebase.orig/tdm/kfrontend/kgreeter.cpp
+++ tdebase/tdm/kfrontend/kgreeter.cpp
@@ -37,8 +37,10 @@ Foundation, Inc., 51 Franklin Street, Fi
#include <ksslcertificate.h>
+#ifndef __dilos__
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
+#endif /* __dilos__ */
#include <tdeapplication.h>
#include <tdelocale.h>
@@ -247,6 +249,7 @@ KGreeter::~KGreeter()
}
void KGreeter::cryptographicCardWatcherSetup() {
+#ifndef __dilos__
cardLoginUser = TQString::null;
// Initialize SmartCard readers
@@ -259,6 +262,7 @@ void KGreeter::cryptographicCardWatcherS
connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
cdevice->enableCardMonitoring(true);
}
+#endif /* __dilos__ */
}
void KGreeter::done(int r) {
@@ -872,6 +876,7 @@ void KGreeter::cryptographicCardInserted
#endif
TQString login_name = TQString::null;
+#ifndef __dilos__
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
KSSLCertificate* card_cert = NULL;
@@ -885,6 +890,7 @@ void KGreeter::cryptographicCardInserted
}
delete card_cert;
}
+#endif /* __dilos__ */
if (login_name != "") {
if (verify->cardLoginInProgress) {
Index: tdebase/tdm/kfrontend/sakdlg.cc
===================================================================
--- tdebase.orig/tdm/kfrontend/sakdlg.cc
+++ tdebase/tdm/kfrontend/sakdlg.cc
@@ -12,8 +12,10 @@
#include <ksslcertificate.h>
+#ifndef __dilos__
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
+#endif /* __dilos__ */
#include <tdeapplication.h>
#include <tdelocale.h>
@@ -135,6 +137,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited()));
mSAKProcess->start();
+#ifndef __dilos__
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -145,6 +148,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
cdevice->enableCardMonitoring(true);
}
+#endif /* __dilos__ */
mControlPipeHandlerThread = new TQEventLoopThread();
mControlPipeHandler = new ControlPipeHandlerObject();
@@ -173,6 +177,7 @@ void SAKDlg::processInputPipeCommand(TQS
void SAKDlg::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
TQString login_name = TQString::null;
+#ifndef __dilos__
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
KSSLCertificate* card_cert = NULL;
@@ -186,6 +191,7 @@ void SAKDlg::cryptographicCardInserted(T
}
delete card_cert;
}
+#endif /* __dilos__ */
if (login_name != "") {
DM dm;
Index: tdebase/tdm/kfrontend/CMakeLists.txt Index: tdebase/tdm/kfrontend/CMakeLists.txt
=================================================================== ===================================================================
--- tdebase.orig/tdm/kfrontend/CMakeLists.txt --- tdebase.orig/tdm/kfrontend/CMakeLists.txt
@ -611,68 +284,6 @@ Index: tdebase/kcontrol/nics/CMakeLists.txt
check_struct_has_member( "struct sockaddr" sa_len "sys/types.h;sys/socket.h" HAVE_STRUCT_SOCKADDR_SA_LEN ) check_struct_has_member( "struct sockaddr" sa_len "sys/types.h;sys/socket.h" HAVE_STRUCT_SOCKADDR_SA_LEN )
Index: tdebase/tdm/cryptocardwatcher/main.cpp
===================================================================
--- tdebase.orig/tdm/cryptocardwatcher/main.cpp
+++ tdebase/tdm/cryptocardwatcher/main.cpp
@@ -41,8 +41,10 @@
#include <ksslcertificate.h>
+#ifndef __dilos__
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
+#endif /* __dilos__ */
#include "watcher.h"
@@ -117,6 +119,7 @@ int main(int argc, char *argv[]) {
tdeapp.disableAutoDcopRegistration();
CardWatcher* watcher = new CardWatcher();
+#ifndef __dilos__
// Initialize SmartCard readers
TDEGenericDevice *hwdevice;
TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
@@ -127,6 +130,7 @@ int main(int argc, char *argv[]) {
TQObject::connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*)));
cdevice->enableCardMonitoring(true);
}
+#endif /* __dilos__ */
// Start TDE application
ret = tdeapp.exec();
Index: tdebase/tdm/cryptocardwatcher/watcher.cc
===================================================================
--- tdebase.orig/tdm/cryptocardwatcher/watcher.cc
+++ tdebase/tdm/cryptocardwatcher/watcher.cc
@@ -21,8 +21,10 @@
#include <ksslcertificate.h>
+#ifndef __dilos__
#include <tdehardwaredevices.h>
#include <tdecryptographiccarddevice.h>
+#endif /* __dilos__ */
#include <dmctl.h>
#include <kuser.h>
@@ -37,6 +39,7 @@ CardWatcher::~CardWatcher() {
void CardWatcher::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) {
TQString login_name = TQString::null;
+#ifndef __dilos__
X509CertificatePtrList certList = cdevice->cardX509Certificates();
if (certList.count() > 0) {
KSSLCertificate* card_cert = NULL;
@@ -50,6 +53,7 @@ void CardWatcher::cryptographicCardInser
}
delete card_cert;
}
+#endif /* __dilos__ */
if (login_name != "") {
// Determine if user already has an active session
Index: tdebase/tdekbdledsync/getfd.c Index: tdebase/tdekbdledsync/getfd.c
=================================================================== ===================================================================
--- tdebase.orig/tdekbdledsync/getfd.c --- tdebase.orig/tdekbdledsync/getfd.c

Loading…
Cancel
Save