Changeset View
Changeset View
Standalone View
Standalone View
x11/sddm/files/patch-src_helper_Backend.cpp
- This file was added.
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:keywords | null | FreeBSD=%H \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- src/helper/Backend.cpp.orig 2019-03-13 09:22:35 UTC | |||||
| +++ src/helper/Backend.cpp | |||||
| @@ -29,6 +29,10 @@ | |||||
| #include <QtCore/QProcessEnvironment> | |||||
| #include <pwd.h> | |||||
| +#if defined(Q_OS_FREEBSD) | |||||
| +#include <sys/types.h> | |||||
| +#include <login_cap.h> | |||||
| +#endif /* defined(Q_OS_FREEBSD) */ | |||||
| namespace SDDM { | |||||
| Backend::Backend(HelperApp* parent) | |||||
| @@ -70,6 +74,19 @@ namespace SDDM { | |||||
| .arg(mainConfig.X11.UserAuthFile.get()); | |||||
| env.insert(QStringLiteral("XAUTHORITY"), value); | |||||
| } | |||||
| +#if defined(Q_OS_FREEBSD) | |||||
| + /* get additional environment variables via setclassenvironment(); | |||||
| + this needs to be done here instead of in UserSession::setupChildProcess | |||||
| + as the environment for execve() is prepared here */ | |||||
| + login_cap_t *lc; | |||||
| + | |||||
| + if ((lc = login_getpwclass(pw)) != 0) { | |||||
| + setclassenvironment(lc, pw, 1); /* path variables */ | |||||
| + setclassenvironment(lc, pw, 0); /* non-path variables */ | |||||
| + /* copy all environment variables that are now set */ | |||||
| + env.insert(QProcessEnvironment::systemEnvironment()); | |||||
| + } | |||||
| +#endif /* defined(Q_OS_FREEBSD) */ | |||||
| // TODO: I'm fairly sure this shouldn't be done for PAM sessions, investigate! | |||||
| m_app->session()->setProcessEnvironment(env); | |||||
| } | |||||