Page MenuHomeFreeBSD
Differential D17297 Diff 48369 x11/sddm/files/patch-src_helper_UserSession.cpp

Changeset View

Standalone View

View Options

x11/sddm/files/patch-src_helper_UserSession.cpp

Run sddm-greeter via the session command (Xsession script) so it also gets X --- src/helper/UserSession.cpp.orig 2017-12-05 16:00:16.000000000 +0000
resources and a ConsoleKit and D-Bus session. The ConsoleKit session has its +++ src/helper/UserSession.cpp 2018-09-23 02:12:31.185222000 +0100
session-class set to "user" instead of "greeter" because ck-launch-session @@ -26,6 +26,9 @@
doesn't provide a way to change this. ConsoleKit doesn't do anything with #include <sys/types.h>
this value though so it is believed to be harmless. The XDG_SESSION_CLASS #include <sys/ioctl.h>
environment variable does have the value "greeter". #include <errno.h>
+#ifdef __FreeBSD__
Remove double quotes because we fixed the use of "$@" in the script. +#include <login_cap.h>
+#endif
--- src/helper/UserSession.cpp.orig 2017-12-05 16:00:16 UTC #include <string.h>
+++ src/helper/UserSession.cpp #include <unistd.h>
@@ -45,10 +45,8 @@ namespace SDDM { #include <pwd.h>
@@ -45,10 +48,8 @@ namespace SDDM {
bool UserSession::start() { bool UserSession::start() {
QProcessEnvironment env = qobject_cast<HelperApp*>(parent())->session()->processEnvironment(); QProcessEnvironment env = qobject_cast<HelperApp*>(parent())->session()->processEnvironment();
- if (env.value(QStringLiteral("XDG_SESSION_CLASS")) == QLatin1String("greeter")) { - if (env.value(QStringLiteral("XDG_SESSION_CLASS")) == QLatin1String("greeter")) {
- QProcess::start(m_path); - QProcess::start(m_path);
- } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")) { - } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")) {
- const QString cmd = QStringLiteral("%1 \"%2\"").arg(mainConfig.X11.SessionCommand.get()).arg(m_path); - const QString cmd = QStringLiteral("%1 \"%2\"").arg(mainConfig.X11.SessionCommand.get()).arg(m_path);
+ if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")) { + if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("x11")) {
+ const QString cmd = QStringLiteral("%1 %2").arg(mainConfig.X11.SessionCommand.get()).arg(m_path); + const QString cmd = QStringLiteral("%1 %2").arg(mainConfig.X11.SessionCommand.get()).arg(m_path);
qInfo() << "Starting:" << cmd; qInfo() << "Starting:" << cmd;
QProcess::start(cmd); QProcess::start(cmd);
} else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("wayland")) { } else if (env.value(QStringLiteral("XDG_SESSION_TYPE")) == QLatin1String("wayland")) {
@@ -112,6 +113,12 @@ namespace SDDM {
const QByteArray username = qobject_cast<HelperApp*>(parent())->user().toLocal8Bit();
struct passwd *pw = getpwnam(username.constData());
+#ifdef __FreeBSD__
adridgUnsubmitted
Not Done
Inline Actions

More typical in Qt code would be Q_OS_FREEBSD

adridg: More typical in Qt code would be Q_OS_FREEBSD
+ if (setusercontext(NULL, pw, pw->pw_uid, LOGIN_SETALL) != 0) {
+ qCritical() << "setusercontext(..., LOGIN_SETALL) failed for user: " << username;
+ exit(Auth::HELPER_OTHER_ERROR);
+ }
+#else /* !__FreeBSD */
if (setgid(pw->pw_gid) != 0) {
qCritical() << "setgid(" << pw->pw_gid << ") failed for user: " << username;
exit(Auth::HELPER_OTHER_ERROR);
@@ -124,6 +131,7 @@ namespace SDDM {
qCritical() << "setuid(" << pw->pw_uid << ") failed for user: " << username;
exit(Auth::HELPER_OTHER_ERROR);
}
+#endif /* !__FreeBSD__ */
if (chdir(pw->pw_dir) != 0) {
qCritical() << "chdir(" << pw->pw_dir << ") failed for user: " << username;
qCritical() << "verify directory exist and has sufficient permissions";