From patchwork Mon Aug 17 09:31:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23646 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 49B4327BBE6; Mon, 17 Aug 2020 10:32:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B154D27BBE5 for ; Mon, 17 Aug 2020 10:32:12 +0100 (BST) Received: from localhost ([::1]:48284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7bUy-0005Qi-6W for patchwork@mira.cbaines.net; Mon, 17 Aug 2020 05:32:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7bUq-0005Lb-4B for guix-patches@gnu.org; Mon, 17 Aug 2020 05:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7bUp-0001jE-PO for guix-patches@gnu.org; Mon, 17 Aug 2020 05:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k7bUp-0003fa-Mw for guix-patches@gnu.org; Mon, 17 Aug 2020 05:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH 06/10] services: dovecot: Only serialize settings with non-empty values. Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Aug 2020 09:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159765669814002 (code B ref 42899); Mon, 17 Aug 2020 09:32:03 +0000 Received: (at 42899) by debbugs.gnu.org; 17 Aug 2020 09:31:38 +0000 Received: from localhost ([127.0.0.1]:59284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7bUQ-0003dg-Gb for submit@debbugs.gnu.org; Mon, 17 Aug 2020 05:31:38 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:44932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k7bUK-0003cJ-Dl for 42899@debbugs.gnu.org; Mon, 17 Aug 2020 05:31:32 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id B18F99D016 for <42899@debbugs.gnu.org>; Mon, 17 Aug 2020 09:00:45 +0000 (UTC) From: Alexey Abramov Date: Mon, 17 Aug 2020 11:31:20 +0200 Message-Id: <20200817093124.30611-6-levenson@mmer.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200817093124.30611-1-levenson@mmer.org> References: <20200817093124.30611-1-levenson@mmer.org> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/mail.scm (serialize-space-separated-string-list): Protocols might have custom settings, which are not supported by other protocols. To prevent dovecot/services from crashing, serialize settings that hold non-empty values only. Signed-off-by: Alexey Abramov --- gnu/services/mail.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 5959d878e7..1d5d322a53 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -99,7 +99,9 @@ (and (string? x) (not (string-index x #\space)))) val))) (define (serialize-space-separated-string-list field-name val) - (serialize-field field-name (string-join val " "))) + (match val + (() #f) + (_ (serialize-field field-name (string-join val " "))))) (define (comma-separated-string-list? val) (and (list? val)