01/03: services: sddm: Fix root login failure issue.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit ed90104cc82fdd6b762a159b06c0ea37b417a9a5
Author: Reza Alizadeh Majd <address@hidden>
Date:   Tue May 21 17:51:09 2019 +0430

    services: sddm: Fix root login failure issue.
    
    * gnu/services/sddm.scm (sdm-pam-service): Set uid from CONFIG.
    (sdm-autologin-pam-service): Set uid from CONFIG.
    (sdm-pam-services): Pass CONFIG to 'sddm-pam-service' and
    'sddm-autologin-pam-service'.
    * doc/guix.texi (X Window): Adjust 'minimum-uid' documentation.
    
    Co-authored-by: Ludovic Courtès <address@hidden>
---
 doc/guix.texi         |  8 ++++----
 gnu/services/sddm.scm | 16 ++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index ee10e65..d60f453 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13623,11 +13623,11 @@ Directory to look for faces.
 @item @code{default-path} (default "/run/current-system/profile/bin")
 Default PATH to use.
 
address@hidden @code{minimum-uid} (default 1000)
-Minimum UID to display in SDDM.
address@hidden @code{minimum-uid} (default: 1000)
+Minimum UID displayed in SDDM and allowed for log-in.
 
address@hidden @code{maximum-uid} (default 2000)
-Maximum UID to display in SDDM
address@hidden @code{maximum-uid} (default: 2000)
+Maximum UID to display in SDDM.
 
 @item @code{remember-last-user?} (default #t)
 Remember last user.
diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm
index b433c59..b0e6d40 100644
--- a/gnu/services/sddm.scm
+++ b/gnu/services/sddm.scm
@@ -175,7 +175,7 @@ Relogin="              (if (sddm-configuration-relogin? 
config)
 (define (sddm-etc-service config)
   (list `("sddm.conf" ,(sddm-configuration-file config))))
 
-(define (sddm-pam-service)
+(define (sddm-pam-service config)
   "Return a PAM service for @command{sddm}."
   (pam-service
    (name "sddm")
@@ -190,7 +190,9 @@ Relogin="              (if (sddm-configuration-relogin? 
config)
      (pam-entry
       (control "required")
       (module "pam_succeed_if.so")
-      (arguments (list "uid >= 1000" "quiet")))
+      (arguments (list (string-append "uid >= "
+                                      (number->string 
(sddm-configuration-minimum-uid config)))
+                       "quiet")))
      ;; should be factored out into system-auth
      (pam-entry
       (control "required")
@@ -249,7 +251,7 @@ Relogin="              (if (sddm-configuration-relogin? 
config)
       (control "required")
       (module "pam_unix.so"))))))
 
-(define (sddm-autologin-pam-service)
+(define (sddm-autologin-pam-service config)
   "Return a PAM service for @command{sddm-autologin}"
   (pam-service
    (name "sddm-autologin")
@@ -261,7 +263,9 @@ Relogin="              (if (sddm-configuration-relogin? 
config)
      (pam-entry
       (control "required")
       (module "pam_succeed_if.so")
-      (arguments (list "uid >= 1000" "quiet")))
+      (arguments (list (string-append "uid >= "
+                                      (number->string 
(sddm-configuration-minimum-uid config)))
+                       "quiet")))
      (pam-entry
       (control "required")
       (module "pam_permit.so"))))
@@ -282,9 +286,9 @@ Relogin="              (if (sddm-configuration-relogin? 
config)
       (module "sddm"))))))
 
 (define (sddm-pam-services config)
-  (list (sddm-pam-service)
+  (list (sddm-pam-service config)
         (sddm-greeter-pam-service)
-        (sddm-autologin-pam-service)))
+        (sddm-autologin-pam-service config)))
 
 (define %sddm-accounts
   (list (user-group (name "sddm") (system? #t))