From patchwork Thu Aug 27 15:17:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23805 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 E8BDC27BBE6; Thu, 27 Aug 2020 16:19:28 +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 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 AB42327BBE5 for ; Thu, 27 Aug 2020 16:19:28 +0100 (BST) Received: from localhost ([::1]:36846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgW-00033G-9P for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg9-0002MP-Aw for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg9-0004dK-04 for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg8-0007hT-RJ for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 5/9] 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: Thu, 27 Aug 2020 15:19:04 +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.159854149529485 (code B ref 42899); Thu, 27 Aug 2020 15:19:04 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:15 +0000 Received: from localhost ([127.0.0.1]:43664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfL-0007fO-93 for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:15 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:51975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf8-0007dQ-4f for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:05 -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 0814D9CF8E for <42899@debbugs.gnu.org>; Thu, 27 Aug 2020 14:47:14 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:39 +0200 Message-Id: <20200827151743.27712-5-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200827151743.27712-1-levenson@mmer.org> References: <20200827151743.27712-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. --- 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 a3c48bdb99..6e166af2be 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)