Differential D27142

Have authhelper define config file paths on its own
ClosedPublic
Actions

Authored by filipf on Feb 3 2020, 8:27 PM.

Details

Reviewers
davidedmundson
Group Reviewers
Plasma
Commits
R123:c4b41ffe6660: Have authhelper define config file paths on its own
R123:83c7fca511f6: Merge branch 'Plasma/5.18'
Summary

Suggested for D26813. Prerequiste if user-manager is to not send any SDDM config file path on its own.

The config file paths are now defined in the authhelper as opposed to being sent in a variant map from the main kcm file.

I also edited paths in that main file because they were wrong.

This does not yet solve bug 414396.

CC-BUG: 342722

Test Plan

Testing with D26813 I managed to write to the config file without user-manager defining the path.

Diff Detail

Repository
R123 SDDM Configuration Panel (KCM)
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
filipf created this revision.Feb 3 2020, 8:27 PM
Restricted Application added a project: Plasma. · View Herald TranscriptFeb 3 2020, 8:27 PM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
filipf requested review of this revision.Feb 3 2020, 8:27 PM
filipf retitled this revision from Have authhelper to Have authhelper define config file paths on its own.Feb 3 2020, 8:28 PM
filipf edited the test plan for this revision. (Show Details)
filipf added reviewers: Plasma, davidedmundson.
filipf added a dependent revision: D26813: Have user-manager write to SDDM's new config file.
davidedmundson added inline comments.Feb 3 2020, 9:05 PM
src/sddmkcm.cpp
55

I don't think this is right.

This file is added below:

systemConfigFiles = QDir(QLatin1String(SDDM_SYSTEM_CONFIG_DIR)).entryList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware);

loops through every file in /etc/sddm.conf.d

filipf added inline comments.Feb 4 2020, 5:36 PM
src/sddmkcm.cpp
55

is mSddmOldConfig even necessary here?

davidedmundson added a comment.Feb 4 2020, 5:41 PM

I dunno, what is it?

filipf added a comment.Feb 4 2020, 5:48 PM
In D27142#605960, @davidedmundson wrote:

I dunno, what is it?

something I added before because I thought the /etc/sddm.conf.d/kde_settings.conf path should also be specified here. That was to be mSddmConfig and then /etc/sddm.conf was meant to be mSddmOldConfig

davidedmundson added a comment.Feb 4 2020, 5:54 PM

oh, then kill it

filipf updated this revision to Diff 75005.Feb 4 2020, 6:02 PM

undo changes for mSddmConfig and kill mSddmOldConfig

davidedmundson accepted this revision.Feb 4 2020, 6:42 PM
This revision is now accepted and ready to land.Feb 4 2020, 6:42 PM
filipf added a comment.Feb 5 2020, 10:25 PM

5.18 then, right?

Closed by commit R123:c4b41ffe6660: Have authhelper define config file paths on its own (authored by filipf). · Explain WhyFeb 9 2020, 6:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msddmauthhelper.cpp (5 lines)
Msrc/sddmkcm.h (1 line)
Msrc/sddmkcm.cpp (6 lines)

Diff 75309

View Options

sddmauthhelper.cpp

Loading...
View Options

src/sddmkcm.h

Loading...
View Options

src/sddmkcm.cpp

Loading...