Notable changes: Greeter runs under the sddm user, it's possible to configure display setup, different install paths in /usr/share Resolves: #1034414 #1035939 #1035950 #1036308 #1038548 #1045722 #1045937 #1065715 #1082229 #1007067 #1027711 #1031745 #1008951 #1016902 #1031415 #1020921epel9
Martin Briza
11 years ago
parent
449e171310
commit
6a348c4aa1
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,16 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
auth required pam_env.so
|
||||||
|
auth required pam_permit.so
|
||||||
|
auth include postlogin
|
||||||
|
account required pam_nologin.so
|
||||||
|
account include system-auth
|
||||||
|
password include system-auth
|
||||||
|
session required pam_selinux.so close
|
||||||
|
session required pam_loginuid.so
|
||||||
|
session optional pam_console.so
|
||||||
|
-session optional pam_ck_connector.so
|
||||||
|
session required pam_selinux.so open
|
||||||
|
session optional pam_keyinit.so force revoke
|
||||||
|
session required pam_namespace.so
|
||||||
|
session include system-auth
|
||||||
|
session include postlogin
|
||||||
@ -1,25 +0,0 @@
|
|||||||
diff --git a/src/greeter/SessionModel.cpp b/src/greeter/SessionModel.cpp
|
|
||||||
index 8c232ba..8269c4c 100644
|
|
||||||
--- a/src/greeter/SessionModel.cpp
|
|
||||||
+++ b/src/greeter/SessionModel.cpp
|
|
||||||
@@ -56,9 +56,6 @@ namespace SDDM {
|
|
||||||
// set role names
|
|
||||||
setRoleNames(roleNames);
|
|
||||||
#endif
|
|
||||||
- // add custom and failsafe session
|
|
||||||
- d->sessions << SessionPtr { new Session {"custom", "Custom", "custom", "Custom Session"} };
|
|
||||||
- d->sessions << SessionPtr { new Session {"failsafe", "Failsafe", "failsafe", "Failsafe Session"} };
|
|
||||||
// read session files
|
|
||||||
QDir dir(Configuration::instance()->sessionsDir());
|
|
||||||
dir.setNameFilters(QStringList() << "*.desktop");
|
|
||||||
@@ -84,6 +81,10 @@ namespace SDDM {
|
|
||||||
// close file
|
|
||||||
inputFile.close();
|
|
||||||
}
|
|
||||||
+ // add custom and failsafe session
|
|
||||||
+// hidden for now --mbriza
|
|
||||||
+// d->sessions << SessionPtr { new Session {"custom", "Custom", "custom", "Custom Session"} };
|
|
||||||
+ d->sessions << SessionPtr { new Session {"failsafe", "Failsafe", "failsafe", "Failsafe Session"} };
|
|
||||||
// find out index of the last session
|
|
||||||
for (int i = 0; i < d->sessions.size(); ++i) {
|
|
||||||
if (d->sessions.at(i)->file == Configuration::instance()->lastSession())
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
--- sddm-7a008602f5f0a4ed8586ce24012983458a687d4e/src/daemon/Authenticator.cpp.pam_end 2013-12-16 15:26:35.749298583 +0100
|
|
||||||
+++ sddm-7a008602f5f0a4ed8586ce24012983458a687d4e/src/daemon/Authenticator.cpp 2013-12-16 15:26:45.273274332 +0100
|
|
||||||
@@ -418,10 +418,9 @@ namespace SDDM {
|
|
||||||
if (m_pam) {
|
|
||||||
m_pam->result = pam_close_session(m_pam->handle, 0);
|
|
||||||
m_pam->result = pam_setcred(m_pam->handle, PAM_DELETE_CRED);
|
|
||||||
- // for some reason this has to be called here too
|
|
||||||
- pam_end(m_pam->handle, m_pam->result);
|
|
||||||
delete m_pam;
|
|
||||||
m_pam = nullptr;
|
|
||||||
+ daemonApp->exit(0); // until PAM is fixed, we have to restart the whole service with audit
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Loading…
Reference in new issue