From 447c1ac34a79b0b9fcfefb41dc05dc122730ecd9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 17 Aug 2009 01:35:48 +0000
Subject: [PATCH] * SLiM / ConsoleKit compatibility hack.

svn path=/nixos/trunk/; revision=16744
---
 modules/security/pam.nix                               | 9 +++++----
 modules/services/x11/xserver/display-managers/slim.nix | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 314f12d4f88..9be1bad0668 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -29,6 +29,8 @@ let
     , # If set, this is a local login (e.g. virtual console or X), so
       # the user gets ownership of audio devices etc.
       localLogin ? false
+    , # Temporary hack to get SLiM to work with ConsoleKit.
+      ckHack ? false
     , # Whether to forward XAuth keys between users.  Mostly useful
       # for "su".
       forwardXAuth ? false
@@ -63,11 +65,10 @@ let
           ${optionalString config.users.ldap.enable
               "session optional ${pam_ldap}/lib/security/pam_ldap.so"}
           session required ${pam_unix2}/lib/security/pam_unix2.so
+          ${optionalString ckHack
+              "session required pam_env.so debug conffile=${envFile} readenv=0"}
           ${optionalString localLogin
-              ''
-                session required pam_env.so debug conffile=${envFile} readenv=0
-                session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so debug
-              ''}
+              "session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so"}
           ${optionalString forwardXAuth
               "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
         '';
diff --git a/modules/services/x11/xserver/display-managers/slim.nix b/modules/services/x11/xserver/display-managers/slim.nix
index 447b0ef5171..2c50b912e73 100644
--- a/modules/services/x11/xserver/display-managers/slim.nix
+++ b/modules/services/x11/xserver/display-managers/slim.nix
@@ -105,7 +105,7 @@ in
         execCmd = "${pkgs.slim}/bin/slim";
       };
 
-    security.pam.services = [ { name = "slim"; localLogin = true; } ];
+    security.pam.services = [ { name = "slim"; localLogin = true; ckHack = true; } ];
 
   };