From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id sKoIM5Fzj2NtPQEAbAwnHQ (envelope-from ) for ; Tue, 06 Dec 2022 17:53:37 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id +D0tM5Fzj2N+XwEAauVa8A (envelope-from ) for ; Tue, 06 Dec 2022 17:53:37 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 42EB4152D1 for ; Tue, 6 Dec 2022 17:53:37 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p2bBo-0003U5-Nq; Tue, 06 Dec 2022 11:53:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2bBm-0003TV-Pc for guix-patches@gnu.org; Tue, 06 Dec 2022 11:53:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p2bBm-0002I0-HW for guix-patches@gnu.org; Tue, 06 Dec 2022 11:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p2bBm-0005iq-DF for guix-patches@gnu.org; Tue, 06 Dec 2022 11:53:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59860] [PATCH 1/2] services: opensmtpd: Use 'match-record' instead of 'match'. Resent-From: mirai@makinata.eu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Dec 2022 16:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59860 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59860@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 59860-submit@debbugs.gnu.org id=B59860.167034554621971 (code B ref 59860); Tue, 06 Dec 2022 16:53:02 +0000 Received: (at 59860) by debbugs.gnu.org; 6 Dec 2022 16:52:26 +0000 Received: from localhost ([127.0.0.1]:43952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2bBC-0005iJ-2U for submit@debbugs.gnu.org; Tue, 06 Dec 2022 11:52:26 -0500 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:46876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2bBA-0005iD-Mp for 59860@debbugs.gnu.org; Tue, 06 Dec 2022 11:52:25 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 0588620BFF for <59860@debbugs.gnu.org>; Tue, 6 Dec 2022 17:52:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id B787880096; Tue, 6 Dec 2022 17:52:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Xj5g4XL7u-_1; Tue, 6 Dec 2022 17:52:23 +0100 (CET) Received: from guix-nuc.home.arpa (bl12-93-156.dsl.telepac.pt [85.245.93.156]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 06B0C80093; Tue, 6 Dec 2022 17:52:22 +0100 (CET) From: mirai@makinata.eu Date: Tue, 6 Dec 2022 16:52:09 +0000 Message-Id: <7d02df3781fe7d6259797598ffe9e36020ad4200.1670345034.git.mirai@makinata.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670345617; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=88PM9nk2BSVhY3ZJW6lyEDBn05tEodKyy8hrBLHjJH0=; b=tVRAaxb+1csyjUqlgILDIqHWAcLsgsXv/3jBSTGzzocx+P114d/TeBf8+/NnXRP9haEaI0 PnumzAVAoGZUcTE6CClfz7i11YO7poOUxpMh2tJ6086Sf+9+PUzmAea04x46nY/Q935EP3 WFNdS7e4IAt8HiBuvWRj6NT0+/S6rcAsajN1UKTuXgC0NE79Uo1bHgIr46Ygo5o7XCtn+V MK4OgYAct20+Tgoq0JVxGuV7Tz4YxavvM+yawhHSbolk5zLINab9wdSvOEPQyCBgNoWr0o XnJF98zmm6praYZr5jRl8FejzFDmuuDeFEwNBhIONnexVz0EL4fhLxqJjHRp1A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670345617; a=rsa-sha256; cv=none; b=BZWo4DxK8MtrWzHX83MikeDRzRqb9UwA2689gcvlMQuUCsLA6YVbt2pXEeElChHmRzG5oe 70ThaiI926z+pj4D2W+adS2UcvOU0tNDpqqYovIGRzOf5Ph1VqhkBF53+O+66A7osn6SSW YFi9sd6Odzvwhr7g1k0OPdU9RJKBIiuGAWbA5jxRxhpeHx9XCgvtMlIq7OgvkA1KsBq4et HTfCkqWcydWHpYnfyElEVFWKKwai5X8FhFqAGNTtMMzaVL6LVlB7xhDRM2gHZ1vn0gYhBb hJYCxSzHdPN4TShyjiM6kzI1aJTPaX9P5M1CQPOIrEeT20Vu7bwlbDXZ9KDHhw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.96 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 42EB4152D1 X-Spam-Score: -2.96 X-Migadu-Scanner: scn0.migadu.com X-TUID: 1XONqpTZJXjl From: Bruno Victal * gnu/services/mail.scm (opensmtpd-shepherd-service) (opensmtpd-activation) (opensmtpd-set-gids): Use 'match-record' instead of 'match'. --- gnu/services/mail.scm | 117 ++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 60 deletions(-) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 2dc235a585..dc4a7986b6 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1666,18 +1666,17 @@ (define %default-opensmtpd-config-file match from local for any action outbound ")) -(define opensmtpd-shepherd-service - (match-lambda - (($ package config-file) - (list (shepherd-service - (provision '(smtpd)) - (requirement '(loopback)) - (documentation "Run the OpenSMTPD daemon.") - (start (let ((smtpd (file-append package "/sbin/smtpd"))) - #~(make-forkexec-constructor - (list #$smtpd "-f" #$config-file) - #:pid-file "/var/run/smtpd.pid"))) - (stop #~(make-kill-destructor))))))) +(define (opensmtpd-shepherd-service config) + (match-record config (package config-file) + (list (shepherd-service + (provision '(smtpd)) + (requirement '(loopback)) + (documentation "Run the OpenSMTPD daemon.") + (start (let ((smtpd (file-append package "/sbin/smtpd"))) + #~(make-forkexec-constructor + (list #$smtpd "-f" #$config-file) + #:pid-file "/var/run/smtpd.pid"))) + (stop #~(make-kill-destructor)))))) (define %opensmtpd-accounts (list (user-group @@ -1698,58 +1697,56 @@ (define %opensmtpd-accounts (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))) -(define opensmtpd-activation - (match-lambda - (($ package config-file) - (let ((smtpd (file-append package "/sbin/smtpd"))) - #~(begin - (use-modules (guix build utils)) - ;; Create mbox and spool directories. - (mkdir-p "/var/mail") - (mkdir-p "/var/spool/smtpd") - (chmod "/var/spool/smtpd" #o711) - (mkdir-p "/var/spool/mail") - (chmod "/var/spool/mail" #o711)))))) +(define (opensmtpd-activation config) + (match-record config (package config-file) + (let ((smtpd (file-append package "/sbin/smtpd"))) + #~(begin + (use-modules (guix build utils)) + ;; Create mbox and spool directories. + (mkdir-p "/var/mail") + (mkdir-p "/var/spool/smtpd") + (chmod "/var/spool/smtpd" #o711) + (mkdir-p "/var/spool/mail") + (chmod "/var/spool/mail" #o711))))) (define %opensmtpd-pam-services (list (unix-pam-service "smtpd"))) -(define opensmtpd-set-gids - (match-lambda - (($ package config-file set-gids?) - (if set-gids? - (list - (setuid-program - (program (file-append package "/sbin/smtpctl")) - (setuid? #false) - (setgid? #true) - (group "smtpq")) - (setuid-program - (program (file-append package "/sbin/sendmail")) - (setuid? #false) - (setgid? #true) - (group "smtpq")) - (setuid-program - (program (file-append package "/sbin/send-mail")) - (setuid? #false) - (setgid? #true) - (group "smtpq")) - (setuid-program - (program (file-append package "/sbin/makemap")) - (setuid? #false) - (setgid? #true) - (group "smtpq")) - (setuid-program - (program (file-append package "/sbin/mailq")) - (setuid? #false) - (setgid? #true) - (group "smtpq")) - (setuid-program - (program (file-append package "/sbin/newaliases")) - (setuid? #false) - (setgid? #true) - (group "smtpq"))) - '())))) +(define (opensmtpd-set-gids config) + (match-record config (package config-file setgid-commands?) + (if setgid-commands? + (list + (setuid-program + (program (file-append package "/sbin/smtpctl")) + (setuid? #false) + (setgid? #true) + (group "smtpq")) + (setuid-program + (program (file-append package "/sbin/sendmail")) + (setuid? #false) + (setgid? #true) + (group "smtpq")) + (setuid-program + (program (file-append package "/sbin/send-mail")) + (setuid? #false) + (setgid? #true) + (group "smtpq")) + (setuid-program + (program (file-append package "/sbin/makemap")) + (setuid? #false) + (setgid? #true) + (group "smtpq")) + (setuid-program + (program (file-append package "/sbin/mailq")) + (setuid? #false) + (setgid? #true) + (group "smtpq")) + (setuid-program + (program (file-append package "/sbin/newaliases")) + (setuid? #false) + (setgid? #true) + (group "smtpq"))) + '()))) (define opensmtpd-service-type (service-type -- 2.38.1