Remove workaround to access user dbus session as root.
This commit is contained in:
parent
4cc07d2366
commit
27462bcddb
|
@ -50,15 +50,6 @@ void OperationRunner::run()
|
||||||
bool status = true;
|
bool status = true;
|
||||||
|
|
||||||
// Disable Plasma removable device automounting
|
// Disable Plasma removable device automounting
|
||||||
unsigned int currentUid = getuid(); // 0 if running as root
|
|
||||||
char *login = getlogin();
|
|
||||||
if (login != nullptr){
|
|
||||||
passwd* pwnam = getpwnam(login);
|
|
||||||
if (pwnam != nullptr) {
|
|
||||||
unsigned int userId = pwnam->pw_uid; // uid of original user before sudo
|
|
||||||
seteuid(userId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
QStringList modules;
|
QStringList modules;
|
||||||
QDBusConnection bus = QDBusConnection::connectToBus(QDBusConnection::SessionBus, QStringLiteral("sessionBus"));
|
QDBusConnection bus = QDBusConnection::connectToBus(QDBusConnection::SessionBus, QStringLiteral("sessionBus"));
|
||||||
QDBusInterface kdedInterface( QStringLiteral("org.kde.kded5"), QStringLiteral("/kded"), QStringLiteral("org.kde.kded5"), bus );
|
QDBusInterface kdedInterface( QStringLiteral("org.kde.kded5"), QStringLiteral("/kded"), QStringLiteral("org.kde.kded5"), bus );
|
||||||
|
@ -69,7 +60,6 @@ void OperationRunner::run()
|
||||||
bool automounter = modules.contains(automounterService);
|
bool automounter = modules.contains(automounterService);
|
||||||
if (automounter)
|
if (automounter)
|
||||||
kdedInterface.call( QStringLiteral("unloadModule"), automounterService );
|
kdedInterface.call( QStringLiteral("unloadModule"), automounterService );
|
||||||
seteuid(currentUid);
|
|
||||||
|
|
||||||
for (int i = 0; i < numOperations(); i++) {
|
for (int i = 0; i < numOperations(); i++) {
|
||||||
suspendMutex().lock();
|
suspendMutex().lock();
|
||||||
|
|
Loading…
Reference in New Issue