From 4790c147bf702f9f00c731eb967297d97356140b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 15 Aug 2011 14:48:32 +0000
Subject: [PATCH] * Revert r28400 because ConsoleKit got reverted to 0.4.1.

svn path=/nixos/trunk/; revision=28587
---
 modules/programs/shadow.nix                       |  3 +--
 modules/services/x11/display-managers/auto.nix    |  5 -----
 modules/services/x11/display-managers/default.nix | 10 ++--------
 modules/services/x11/display-managers/slim.nix    | 11 +----------
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/modules/programs/shadow.nix b/modules/programs/shadow.nix
index 68e9fe38f5b1..81286d9bb5c7 100644
--- a/modules/programs/shadow.nix
+++ b/modules/programs/shadow.nix
@@ -75,8 +75,7 @@ in
     security.pam.services =
       [ { name = "chsh"; rootOK = true; }
         { name = "chfn"; rootOK = true; }
-        # Enable ‘ownDevices’ for the services/x11/display-managers/auto.nix module.
-        { name = "su"; rootOK = true; ownDevices = true; forwardXAuth = true; }
+        { name = "su"; rootOK = true; forwardXAuth = true; }
         { name = "passwd"; }
         # Note: useradd, groupadd etc. aren't setuid root, so it
         # doesn't really matter what the PAM config says as long as it
diff --git a/modules/services/x11/display-managers/auto.nix b/modules/services/x11/display-managers/auto.nix
index 7518dc350f75..e2b1ee42e832 100644
--- a/modules/services/x11/display-managers/auto.nix
+++ b/modules/services/x11/display-managers/auto.nix
@@ -52,11 +52,6 @@ in
           '';
       };
 
-    # The ConsoleKit PAM connector launches a local session, but it's
-    # not set as "active" (maybe because x11-display-device is not
-    # set).  Launching a child session seems to fix that.
-    services.xserver.displayManager.forceCKSession = true;
-    
   };
 
 }
diff --git a/modules/services/x11/display-managers/default.nix b/modules/services/x11/display-managers/default.nix
index 6308ff0f5bb2..7e21f27ff69d 100644
--- a/modules/services/x11/display-managers/default.nix
+++ b/modules/services/x11/display-managers/default.nix
@@ -55,8 +55,8 @@ let
 
       # Start a ConsoleKit session so that we get ownership of various
       # devices.
-      if [ \( -z "$XDG_SESSION_COOKIE" -o -n "${toString cfg.displayManager.forceCKSession}" \) -a -z "$CK_STARTED" ]; then
-          CK_STARTED=1 exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
+      if test -z "$XDG_SESSION_COOKIE"; then
+          exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
       # Handle being called by kdm.
@@ -164,12 +164,6 @@ in
         apply = toString;
       };
 
-      forceCKSession = mkOption {
-        internal = true;
-        default = false;
-        description = "Whether to force launching of a ConsoleKit session.";
-      };
-
       session = mkOption {
         default = [];
         example = [
diff --git a/modules/services/x11/display-managers/slim.nix b/modules/services/x11/display-managers/slim.nix
index fb6f1de9d5a0..0e48cae7423f 100644
--- a/modules/services/x11/display-managers/slim.nix
+++ b/modules/services/x11/display-managers/slim.nix
@@ -106,17 +106,8 @@ in
 
     # Allow null passwords so that the user can login as root on the
     # installation CD.
-    security.pam.services = singleton
-      { name = "slim";
-        allowNullPassword = true;
-        ownDevices = true;
-      };
+    security.pam.services = [ { name = "slim"; allowNullPassword = true; } ];
 
-    # The ConsoleKit PAM connector launches a local session, but it's
-    # not set as "active" (maybe because x11-display-device is not
-    # set).  Launching a child session seems to fix that.
-    services.xserver.displayManager.forceCKSession = true;
-    
   };
 
 }