2017-04-22 12:02:27 +00:00
|
|
|
From ba74d639178916221c748b0d5d89f7ac4f5ed669 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
|
|
Date: Sat, 22 Apr 2017 14:00:33 +0200
|
|
|
|
Subject: [PATCH] Revert "Disallow executing Dolphin as root on Linux"
|
|
|
|
|
|
|
|
This reverts commit 0bdd8e0b0516555c6233fdc7901e9b417cf89791.
|
|
|
|
We ship a desktop file to open dolphin as root and we allow YaST on the
|
|
|
|
desktop. So this patch is absolutely pointless for us.
|
|
|
|
---
|
|
|
|
src/main.cpp | 13 -------------
|
|
|
|
1 file changed, 13 deletions(-)
|
|
|
|
|
2018-04-10 13:19:32 +00:00
|
|
|
Index: dolphin-18.03.90/src/main.cpp
|
2017-07-15 21:27:52 +00:00
|
|
|
===================================================================
|
2018-04-10 13:19:32 +00:00
|
|
|
--- dolphin-18.03.90.orig/src/main.cpp
|
|
|
|
+++ dolphin-18.03.90/src/main.cpp
|
2017-04-22 12:02:27 +00:00
|
|
|
@@ -35,21 +35,8 @@
|
2018-04-10 13:19:32 +00:00
|
|
|
#include <QApplication>
|
|
|
|
#include <QCommandLineParser>
|
2017-04-22 12:02:27 +00:00
|
|
|
|
|
|
|
-#ifndef Q_OS_WIN
|
|
|
|
-#include <unistd.h>
|
|
|
|
-#endif
|
|
|
|
-#include <iostream>
|
|
|
|
-
|
|
|
|
extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
|
|
|
{
|
|
|
|
-#ifndef Q_OS_WIN
|
|
|
|
- // Check whether we are running as root
|
|
|
|
- if (getuid() == 0) {
|
|
|
|
- std::cout << "Executing Dolphin as root is not possible." << std::endl;
|
|
|
|
- return EXIT_FAILURE;
|
|
|
|
- }
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
QApplication app(argc, argv);
|
|
|
|
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
|
|
|
|
app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
|