me
/
guix
Archived
1
0
Fork 0
Code

services: cups: Add cups PAM service. 

Fixes <https://issues.guix.gnu.org/63198>.

Have the CUPS service extend pam-root-service-type providing minimal
configuration to authenticate users.  Since PAM authentication is provided,
the regular cups package can be used as default instead of the minimal,
PAM-lacking variant.

* gnu/services/cups.scm (cups-configuration)
[cups]: Replace cups-minimal with cups.
[allow-empty-password?]: PAM service configuration permitting empty passwords.
(opaque-cups-configuration): Likewise.
(cups-pam-service): New procedure.
(cups-service-type): Extend pam-root-service-type with cups-pam-service.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
master
muradm 2023-05-13 21:38:00 +03:00 committed by Maxim Cournoyer
parent 297ba5c15a
commit e02584b456
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/services/cups.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 muradm <mail@muradm.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -25,6 +26,7 @@
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
#:use-module (gnu system pam)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu packages cups) #:use-module (gnu packages cups)
@ -500,8 +502,11 @@ programs.")
(define-configuration cups-configuration (define-configuration cups-configuration
(cups (cups
(file-like cups-minimal) (file-like cups)
"The CUPS package.") "The CUPS package.")
(allow-empty-password?
(boolean #f)
"Specifies whether empty passwords will be allowed when authenticating via PAM.")
(extensions (extensions
(package-list (list brlaser cups-filters epson-inkjet-printer-escpr (package-list (list brlaser cups-filters epson-inkjet-printer-escpr
foomatic-filters hplip-minimal splix)) foomatic-filters hplip-minimal splix))
@ -841,8 +846,11 @@ IPP specifications.")
(define-configuration opaque-cups-configuration (define-configuration opaque-cups-configuration
(cups (cups
(package cups-minimal) (package cups)
"The CUPS package.") "The CUPS package.")
(allow-empty-password?
(boolean #f)
"Specifies whether empty passwords will be allowed when authenticating via PAM.")
(extensions (extensions
(package-list '()) (package-list '())
"Drivers and other extensions to the CUPS package.") "Drivers and other extensions to the CUPS package.")
@ -1006,6 +1014,14 @@ extensions that it uses."
"-f" "-c" #$cupsd.conf "-s" #$cups-files.conf))) "-f" "-c" #$cupsd.conf "-s" #$cups-files.conf)))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define (cups-pam-service config)
(let ((allow-empty-password?
(if (opaque-cups-configuration? config)
(opaque-cups-configuration-allow-empty-password? config)
(cups-configuration-allow-empty-password? config))))
(list (unix-pam-service "cups"
#:allow-empty-passwords? allow-empty-password?))))
(define cups-service-type (define cups-service-type
(service-type (name 'cups) (service-type (name 'cups)
(extensions (extensions
@ -1013,6 +1029,8 @@ extensions that it uses."
cups-shepherd-service) cups-shepherd-service)
(service-extension activation-service-type (service-extension activation-service-type
(const %cups-activation)) (const %cups-activation))
(service-extension pam-root-service-type
cups-pam-service)
(service-extension account-service-type (service-extension account-service-type
(const %cups-accounts)))) (const %cups-accounts))))