From 720d51179efa2bd987d1abb642c20a2e1f6031f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 May 2009 14:57:31 +0000
Subject: [PATCH] * kdm needs the "kde" PAM module, but you only get it when
 KDE is   enabled as a session type.  Since I'm lazy, provide it  
 unconditionally.  Also have it include "common-console" to set   device
 ownership when logging in.

svn path=/nixos/branches/modular-nixos/; revision=15800
---
 .../xserver/desktop-managers/kde.pam => security/pam.d/kde}    | 1 +
 modules/security/pam.nix                                       | 1 +
 modules/services/x11/xserver/desktop-managers/kde.nix          | 3 ---
 modules/services/x11/xserver/desktop-managers/kde4.nix         | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename modules/{services/x11/xserver/desktop-managers/kde.pam => security/pam.d/kde} (76%)

diff --git a/modules/services/x11/xserver/desktop-managers/kde.pam b/modules/security/pam.d/kde
similarity index 76%
rename from modules/services/x11/xserver/desktop-managers/kde.pam
rename to modules/security/pam.d/kde
index 50f3cc5ce607..dac4fec866c8 100644
--- a/modules/services/x11/xserver/desktop-managers/kde.pam
+++ b/modules/security/pam.d/kde
@@ -2,3 +2,4 @@ auth     include        common
 account  include        common
 password include        common
 session  include        common
+session  include        common-console
diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 8ac6fddcc639..a3fef459edba 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -51,6 +51,7 @@ in
       "cups"
       "ftp"
       "ejabberd"
+      "kde"
       "common"
       "common-console" # shared stuff for interactive local sessions
     ];
diff --git a/modules/services/x11/xserver/desktop-managers/kde.nix b/modules/services/x11/xserver/desktop-managers/kde.nix
index 4bea8308e409..f8fb9f534f5e 100644
--- a/modules/services/x11/xserver/desktop-managers/kde.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde.nix
@@ -68,9 +68,6 @@ mkIf cfg.enable {
     ];
 
     etc = [
-      { source = ./kde.pam;
-        target = "pam.d/kde";
-      }
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
       }
diff --git a/modules/services/x11/xserver/desktop-managers/kde4.nix b/modules/services/x11/xserver/desktop-managers/kde4.nix
index c74429e74860..78cf90e33e40 100644
--- a/modules/services/x11/xserver/desktop-managers/kde4.nix
+++ b/modules/services/x11/xserver/desktop-managers/kde4.nix
@@ -64,9 +64,6 @@ mkIf cfg.enable {
     ];
 
     etc = [
-      { source = ./kde.pam;
-        target = "pam.d/kde";
-      }
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
       }