From f12607b990c7fea530b2c73d7bbb62a38f49d713 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 5 Sep 2013 18:05:25 +0200
Subject: [stage4] Allow basic kde autostart files

---
 server/blacklists/x-autostart/kde-autostart          | 5 +++++
 server/modules/pam-freiburg/etc/pam.d/common-session | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'server')

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
-- 
cgit v1.2.3-55-g7522