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(-)
|
|
|
|
|
2019-11-29 11:38:56 +00:00
|
|
|
Index: dolphin-19.03.60git.20191013T183353~0caab3c0a/src/main.cpp
|
2017-07-15 21:27:52 +00:00
|
|
|
===================================================================
|
2019-11-29 11:38:56 +00:00
|
|
|
--- dolphin-19.03.60git.20191013T183353~0caab3c0a.orig/src/main.cpp 2019-10-13 18:33:53.000000000 +0200
|
|
|
|
+++ dolphin-19.03.60git.20191013T183353~0caab3c0a/src/main.cpp 2019-10-14 07:14:20.922172281 +0200
|
2019-07-26 14:02:23 +00:00
|
|
|
@@ -39,25 +39,8 @@
|
|
|
|
#include <QDBusAbstractInterface>
|
|
|
|
#include <QDBusConnectionInterface>
|
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
|
2018-07-28 13:22:05 +00:00
|
|
|
- // Prohibit using sudo or kdesu (but allow using the root user directly)
|
2017-04-22 12:02:27 +00:00
|
|
|
- if (getuid() == 0) {
|
2018-07-28 13:22:05 +00:00
|
|
|
- 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;
|
|
|
|
- }
|
2017-04-22 12:02:27 +00:00
|
|
|
- }
|
|
|
|
-#endif
|
2018-07-28 13:22:05 +00:00
|
|
|
|
2019-11-29 11:38:56 +00:00
|
|
|
/**
|
|
|
|
* enable high dpi support
|