From patchwork Thu Jun 20 09:11:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 14358 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4BF08170CB; Thu, 20 Jun 2019 10:40:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 32B4917019 for ; Thu, 20 Jun 2019 10:40:03 +0100 (BST) Received: from localhost ([::1]:45394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtY2-0004R8-Af for patchwork@mira.cbaines.net; Thu, 20 Jun 2019 05:40:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49721) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtE6-00033W-0t for guix-patches@gnu.org; Thu, 20 Jun 2019 05:19:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdt71-00070H-9x for guix-patches@gnu.org; Thu, 20 Jun 2019 05:12:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34309) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hdt6v-0006tS-UP for guix-patches@gnu.org; Thu, 20 Jun 2019 05:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hdt6v-0004yw-MG for guix-patches@gnu.org; Thu, 20 Jun 2019 05:12:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36239] [PATCH] opensmtpd-service-type to extend pam Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jun 2019 09:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= , Kristofer Buffington Received: via spool by 36239-submit@debbugs.gnu.org id=B36239.156102192019143 (code B ref 36239); Thu, 20 Jun 2019 09:12:01 +0000 Received: (at 36239) by debbugs.gnu.org; 20 Jun 2019 09:12:00 +0000 Received: from localhost ([127.0.0.1]:47853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hdt6u-0004yh-B9 for submit@debbugs.gnu.org; Thu, 20 Jun 2019 05:12:00 -0400 Received: from tobias.gr ([80.241.217.52]:38348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hdt6p-0004yS-W0 for 36239@debbugs.gnu.org; Thu, 20 Jun 2019 05:11:58 -0400 Received: by tobias.gr (OpenSMTPD) with ESMTP id 46eaec68; Thu, 20 Jun 2019 09:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=tobias.gr; h=from:to:cc :subject:references:in-reply-to:date:message-id:mime-version :content-type; s=2018; i=me@tobias.gr; bh=R8tx8tDCXUUI5Vl1Go4q0B WmwOfDSv+saZoayexDO6Q=; b=K2N0FncNBk+ockvSaUQ5P2xLIJNcMjc8UtC7pO iI+Ltrt2OEEao7h83b/D3EfkeTUJ0q3bubxS8T//3fJ2LLQOx8el8tvyEx/jymBw qJrmX45UoRdN2Nqsza9wQwfC8XYGTKNQKvZr8v9NMi6pLwDzgK5XZVkdEmu0/uWB vFD/IZF6pjekgJmzzyCYbhESr4bckiRvyPIVXgnPM6YYO0sC1qzniUjN2yMJXRQn THq+kco3IMMPBjA+epjGKxWiNw6AiVY6Cy7aTvxT/5FwoL1sVUj5nOshF+8uYq1F RTwREh80oLNNeLiXWSrvoTTPmFLxWB5Z1qV6ZumJvBz6+G/w== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 22cdb663 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 20 Jun 2019 09:11:50 +0000 (UTC) From: Tobias Geerinckx-Rice References: <87sgsaxn6t.fsf@walletsworth.com> <87tvcl1f76.fsf@gnu.org> <87tvclqdsd.fsf@walletsworth.com> In-reply-to: <87tvclqdsd.fsf@walletsworth.com> Date: Thu, 20 Jun 2019 11:11:50 +0200 Message-ID: <87k1dgsjs9.fsf@nckx> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 36239@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Kristofer, Ludo', Kristofer Buffington wrote: > The opensmtpd package includes --with-pam at build time, but the > service > does not extend pam. As a result, an administrator would need to > maintain a seperate passwd or other authentication > mechanism instead of using PAM. Thanks for the patch! Looks good to me, assuming you've battle-tested the thing. I've Guixed up the commit message, but let's give Ludo' a chance to respond. > walletsworth I feel all, like, personally offended. Kind regards, T G-R From 60f3fd35ac4925e86556781ccc2620f54dccacd9 Mon Sep 17 00:00:00 2001 From: Kristofer Buffington Date: Wed, 12 Jun 2019 16:34:30 -0400 Subject: [PATCH] services: opensmtpd: Extend the PAM service. * gnu/services/mail.scm (%opensmtpd-pam-services): New variable. (opensmtpd-service-type)[extensions]: Add it, extending PAM-ROOT-SERVICE-TYPE. Signed-off-by: Tobias Geerinckx-Rice --- gnu/services/mail.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 0e85ada3d0..3de0b4c2f3 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2019 Kristofer Buffington ;;; ;;; This file is part of GNU Guix. ;;; @@ -1667,6 +1668,9 @@ accept from local for any relay (mkdir-p "/var/spool/smtpd") (chmod "/var/spool/smtpd" #o711)))))) +(define %opensmtpd-pam-services + (list (unix-pam-service "smtpd"))) + (define opensmtpd-service-type (service-type (name 'opensmtpd) @@ -1675,6 +1679,8 @@ accept from local for any relay (const %opensmtpd-accounts)) (service-extension activation-service-type opensmtpd-activation) + (service-extension pam-root-service-type + (const %opensmtpd-pam-services)) (service-extension profile-service-type (compose list opensmtpd-configuration-package)) (service-extension shepherd-root-service-type -- 2.22.0