From bf71f730b3e204d4404fbd47562946170bf87de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 25 May 2020 12:56:52 +0200 Subject: klaptopdaemon: Fix acpi helper violation check. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Dependence on crcresult.h solved correctly. 2. Used macro tde_add_executable to define makecrc target. 3. Fixed command to run makecrc - it depends on both makecrc and klaptop_acpi_helper, - it must be run in build binary directory, not source, - the target name is used as the makecrc command, so there is no need to use get_target_property( ... LOCATION ), which caused a warning due to CMP0026. 4. The block of code that performs the binary violation verification was rolled back because it was removed in commit 2abe1e6f40 for an unknown reason, and the check was not actually performed. Signed-off-by: Slávek Banko --- klaptopdaemon/apm.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'klaptopdaemon/apm.cpp') diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index a7cb189..e2940d2 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -187,6 +187,17 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend unsigned long len, crc; TQString helper = TDEStandardDirs::findExe("klaptop_acpi_helper"); checkcrc(helper.latin1(), len, crc); + if (len != file_len || crc != file_crc) + { + TQString str(i18n("The %1 application does not seem to have " + "the same size or checksum as when it was compiled we do NOT recommend " + "you proceed with making it setuid-root without further investigation").arg(helper)); + int rc = KMessageBox::warningContinueCancel(0, str, i18n("KLaptopDaemon"), i18n("Run Nevertheless")); + if (rc != KMessageBox::Continue) + { + return; + } + } TQString tdesu = TDEStandardDirs::findExe("tdesu"); if (!tdesu.isEmpty()) { -- cgit v1.2.1