From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:42730) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icY3U-0003NP-QK for guix-patches@gnu.org; Wed, 04 Dec 2019 12:03:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icY3M-0003QV-17 for guix-patches@gnu.org; Wed, 04 Dec 2019 12:03:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36605) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icY3L-0003Lp-Rj for guix-patches@gnu.org; Wed, 04 Dec 2019 12:03:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1icY3K-0008QP-OL for guix-patches@gnu.org; Wed, 04 Dec 2019 12:03:02 -0500 Subject: bug#38160: GNOME Keyring service Resent-To: guix-patches@gnu.org Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <057a95242009b1560b82547f7e0bec8b41a437c9.camel@student.tugraz.at> Date: Wed, 04 Dec 2019 18:02:11 +0100 In-Reply-To: <057a95242009b1560b82547f7e0bec8b41a437c9.camel@student.tugraz.at> (Leo Prikler's message of "Sun, 10 Nov 2019 14:06:30 +0100") Message-ID: <87muc8c9d8.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Leo Prikler Cc: 38160-done@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Leo, Leo Prikler skribis: > From 9ac5f99a65f0599a3210443305042155f9b06e39 Mon Sep 17 00:00:00 2001 > From: Leo Prikler > Date: Sat, 9 Nov 2019 16:14:45 +0100 > Subject: [PATCH] gnu: Add GNOME Keyring service > > * gnu/services/desktop.scm: (): New record t= ype. > (gnome-keyring-service-type): New service type. > * doc/guix.texi: Document it. Nice! Applied with the minor doc changes below. Thanks, Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/doc/guix.texi b/doc/guix.texi index 51948dc0f7..712f814cdc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15755,7 +15755,8 @@ Users need to be in the @code{lp} group to access the D-Bus service. @defvr {Scheme Variable} gnome-keyring-service-type This is the type of the service that adds the -@uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}. Its value is a @code{gnome-keyring-configuration} object (see below.) +@uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}. Its +value is a @code{gnome-keyring-configuration} object (see below.) This service adds the @code{gnome-keyring} package to the system profile and extends PAM with entries using @code{pam_gnome_keyring.so}, unlocking @@ -15768,14 +15769,18 @@ Configuration record for the GNOME Keyring service. @table @asis @item @code{keyring} (default: @code{gnome-keyring}) The GNOME keyring package to use. + @item @code{pam-services} -An alist (SERVICE . KIND) of PAM services to extend. SERVICE is the name -of an existing service to extend and KIND is one of @code{login} or -@code{passwd}. If @code{login} is given, it adds an optional +A list of @code{(@var{service} . @var{kind})} pairs denoting PAM +services to extend, where @var{service} is the name of an existing +service to extend and @var{kind} is one of @code{login} or +@code{passwd}. + +If @code{login} is given, it adds an optional @code{pam_gnome_keyring.so} to the auth block without arguments and to -the session block with @code{auto_start}. -If @code{passwd} is given, it adds an optional @code{pam_gnome_keyring.so} -to the password block without arguments. +the session block with @code{auto_start}. If @code{passwd} is given, it +adds an optional @code{pam_gnome_keyring.so} to the password block +without arguments. By default, this field contains ``gdm-password'' with the value @code{login} and ``passwd'' is with the value @code{passwd}. --=-=-=--