diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-18 02:32:16 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-18 02:32:16 +0000 |
| commit | 2abe1e6f4022109b1e179242aa9765810d7f680c (patch) | |
| tree | 408f52f8bc6e4ae2a1c093439be5404fbbce56be /klaptopdaemon/apm.cpp | |
| parent | 2bda8f7717adf28da4af0d34fb82f63d2868c31d (diff) | |
| download | tdeutils-2abe1e6f4022109b1e179242aa9765810d7f680c.tar.gz tdeutils-2abe1e6f4022109b1e179242aa9765810d7f680c.zip | |
* ark context un[tar/zip/bz] crash repair
* gcc4.4 compilation fixes
* superkaramba xmms sensor addition
* automake updates
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1063396 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'klaptopdaemon/apm.cpp')
| -rw-r--r-- | klaptopdaemon/apm.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index a13a907..ab25010 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -166,7 +166,7 @@ void ApmConfig::setupHelper() proc << kdesu; proc << "-u"; proc << "root"; - proc << QString("chown root ")+apm_name+"; chmod +s "+apm_name; + proc << QString("dpkg-statoverride --update --add root root 6755 ")+apm_name; proc.start(KProcess::Block); // run it sync so has_apm below sees the results } } else { @@ -187,14 +187,6 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend unsigned long len, crc; QString helper = KStandardDirs::findExe("klaptop_acpi_helper"); checkcrc(helper.latin1(), len, crc); - if (len != file_len || crc != file_crc) { - QString 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; - } QString kdesu = KStandardDirs::findExe("kdesu"); if (!kdesu.isEmpty()) { @@ -208,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend proc << kdesu; proc << "-u"; proc << "root"; - proc << "chown root "+helper+"; chmod +s "+helper; + proc << "dpkg-statoverride --update --add root root 6755 "+helper; proc.start(KProcess::Block); // run it sync so has_acpi below sees the results } } else { |