Update hidden state correctly

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index e05c67d96a13c2fcadf44a33ecb35324c62bfcb7..3db63eab0c6d0bc61e21f6cdb1048c4b68b3a578 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,21 +19,22 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

+#include "dbusinterface.h"
+#include "dolphin_generalsettings.h"

 #include "dolphin_version.h"
 #include "dolphin_version.h"

+#include "dolphindebug.h"

 #include "dolphinmainwindow.h"
 #include "dolphinmainwindow.h"

-#include "dolphin_generalsettings.h"
-#include "dbusinterface.h"

 #include "global.h"
 #include "global.h"

-#include "dolphindebug.h"

 
 

-#include <KDBusService>

 #include <KAboutData>
 #include <KCrash>
 #include <KAboutData>
 #include <KCrash>

-#include <QCommandLineParser>
-#include <QApplication>
+#include <KDBusService>

 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
 
 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
 

+#include <QApplication>
+#include <QCommandLineParser>
+

 #ifndef Q_OS_WIN
 #include <unistd.h>
 #endif
 #ifndef Q_OS_WIN
 #include <unistd.h>
 #endif


@@ -42,10 +43,15 @@
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
 #ifndef Q_OS_WIN
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
 #ifndef Q_OS_WIN

-    // Check whether we are running as root
+    // Prohibit using sudo or kdesu (but allow using the root user directly)

     if (getuid() == 0) {
     if (getuid() == 0) {

-        std::cout << "Executing Dolphin as root is not possible." << std::endl;
-        return EXIT_FAILURE;
+        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
+            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+            return EXIT_FAILURE;
+        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
+            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+            return EXIT_FAILURE;
+        }

     }
 #endif
 
     }
 #endif
 


@@ -107,8 +113,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     DBusInterface interface;
 
     QCommandLineParser parser;
     DBusInterface interface;
 
     QCommandLineParser parser;

-    parser.addVersionOption();
-    parser.addHelpOption();

     aboutData.setupCommandLine(&parser);
 
     // command line options
     aboutData.setupCommandLine(&parser);
 
     // command line options


@@ -140,7 +144,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     }
 
     DolphinMainWindow* mainWindow = new DolphinMainWindow();
     }
 
     DolphinMainWindow* mainWindow = new DolphinMainWindow();

-    mainWindow->setAttribute(Qt::WA_DeleteOnClose);

 
     if (parser.isSet(QStringLiteral("select"))) {
         mainWindow->openFiles(urls, splitView);
 
     if (parser.isSet(QStringLiteral("select"))) {
         mainWindow->openFiles(urls, splitView);