From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 15 20:46:55 2017 Received: (at submit) by debbugs.gnu.org; 16 Mar 2017 00:46:55 +0000 Received: from localhost ([127.0.0.1]:57711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coJZ8-0005U3-PN for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coJZ7-0005Tp-31 for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coJZ0-0004jz-Ny for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:48 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58638) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coJZ0-0004js-Kj for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coJYz-0003Rn-0U for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coJYw-0004iE-Fm for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:45 -0400 Received: from mail.lassieur.org ([83.152.10.219]:35788 helo=ron) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coJYw-0004dJ-76 for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:42 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by ron (OpenSMTPD) with ESMTPSA id 5e074d34 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for ; Thu, 16 Mar 2017 00:46:38 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= To: guix-patches@gnu.org Subject: [PATCH] services: dovecot: Fix passwd and userdb 'args' types. Date: Thu, 16 Mar 2017 01:46:31 +0100 Message-Id: <20170316004631.25613-2-clement@lassieur.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170316004631.25613-1-clement@lassieur.org> References: <20170316004631.25613-1-clement@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) * gnu/services/mail.scm (passwd-configuration)[args] (userdb-configuration)[args]: Change type from 'free-form-args' to 'space-separated-string-list'. * doc/guix.texi (Mail Services): Document it. See http://wiki2.dovecot.org/AuthDatabase/PasswdFile#Examples for an example with a string that is not a list of key-value pairs. --- doc/guix.texi | 12 ++++++------ gnu/services/mail.scm | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 78bf03de9..a0345f6f1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11145,9 +11145,9 @@ The driver that the passdb should use. Valid values include Defaults to @samp{"pam"}. @end deftypevr -@deftypevr {@code{passdb-configuration} parameter} free-form-args args -A list of key-value args to the passdb driver. -Defaults to @samp{()}. +@deftypevr {@code{passdb-configuration} parameter} space-separated-string-list args +Space separated list of arguments to the passdb driver. +Defaults to @samp{""}. @end deftypevr @end deftypevr @@ -11164,9 +11164,9 @@ The driver that the userdb should use. Valid values include Defaults to @samp{"passwd"}. @end deftypevr -@deftypevr {@code{userdb-configuration} parameter} free-form-args args -A list of key-value args to the userdb driver. -Defaults to @samp{()}. +@deftypevr {@code{userdb-configuration} parameter} space-separated-string-list args +Space separated list of arguments to the userdb driver. +Defaults to @samp{""}. @end deftypevr @deftypevr {@code{userdb-configuration} parameter} free-form-args override-fields diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 05978e006..20043d751 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -160,8 +160,8 @@ @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth}, and @samp{static}.") (args - (free-form-args '()) - "A list of key-value args to the passdb driver.")) + (space-separated-string-list '()) + "Space separated list of arguments to the passdb driver.")) (define (serialize-passdb-configuration field-name val) (format #t "passdb {\n") @@ -178,8 +178,8 @@ "The driver that the userdb should use. Valid values include @samp{passwd} and @samp{static}.") (args - (free-form-args '()) - "A list of key-value args to the userdb driver.") + (space-separated-string-list '()) + "Space separated list of arguments to the userdb driver.") (override-fields (free-form-args '()) "Override fields from passwd.")) -- 2.12.0