diff options
| author | Christian Rößler | 2013-09-06 13:00:36 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-09-06 13:00:36 +0200 |
| commit | 898c1e61a60135dc1a54dd1e111e19c703baa487 (patch) | |
| tree | 3dfa72e2295b2ea6441f1c4ab4eb01bfc27b9bc0 /server | |
| parent | [export_target] Added two trailing slashes at mksquashfs calls. (diff) | |
| parent | [udisks] Include udisks and udisks2 in Ubuntu 13.04 (diff) | |
| download | tm-scripts-898c1e61a60135dc1a54dd1e111e19c703baa487.tar.gz tm-scripts-898c1e61a60135dc1a54dd1e111e19c703baa487.tar.xz tm-scripts-898c1e61a60135dc1a54dd1e111e19c703baa487.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'server')
| -rw-r--r-- | server/blacklists/x-autostart/kde-autostart | 5 | ||||
| -rw-r--r-- | server/modules/pam-freiburg/etc/pam.d/common-session | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/server/blacklists/x-autostart/kde-autostart b/server/blacklists/x-autostart/kde-autostart index 4d384303..131a8563 100644 --- a/server/blacklists/x-autostart/kde-autostart +++ b/server/blacklists/x-autostart/kde-autostart @@ -1,5 +1,10 @@ + /usr/share/autostart/**/ - /usr/share/autostart/** ++ /usr/share/autostart/kdesktop.desktop ++ /usr/share/autostart/krunner.desktop ++ /usr/share/autostart/plasma.desktop ++ /usr/share/autostart/plasma-desktop.desktop ++ /usr/share/autostart/polkit-kde-authentication-agent-1.desktop + /opt/kde3/share/autostart/**/ - /opt/kde3/share/autostart/** diff --git a/server/modules/pam-freiburg/etc/pam.d/common-session b/server/modules/pam-freiburg/etc/pam.d/common-session index 1eb564a3..9a8b73e1 100644 --- a/server/modules/pam-freiburg/etc/pam.d/common-session +++ b/server/modules/pam-freiburg/etc/pam.d/common-session @@ -27,7 +27,7 @@ session required pam_permit.so session optional pam_umask.so # and here are more per-package modules (the "Additional" block) session required pam_systemd.so -session optional pam_ck_connector.so nox11 +session optional pam_ck_connector.so session optional pam_env.so readenv=1 session optional pam_env.so readenv=1 envfile=/etc/default/locale session optional pam_krb5.so minimum_uid=1000 |