Make GnuPG automatically find a pinentry installed by Guix. Try using $HOME or, if that variable is not set, use the system password database, or fall back to looking in "/". More information: https://bugs.gnu.org/24076 diff --git a/common/homedir.c b/common/homedir.c index 4b6e46e88..f7ae68ba5 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -33,6 +33,7 @@ #include #include #include +#include #ifdef HAVE_W32_SYSTEM #include /* Due to the stupid mingw64 requirement to @@ -67,6 +68,10 @@ * gnupg_homedir and gnupg_set_homedir. Malloced. */ static char *the_gnupg_homedir; +/* The user's home directory. Used in Guix to help GnuPG find the + * pinentry. */ +static char *the_user_homedir; + /* Flag indicating that home directory is not the default one. */ static byte non_default_homedir; @@ -509,6 +514,25 @@ gnupg_homedir (void) return the_gnupg_homedir; } +/* Return the user's home directory */ +const char * +user_homedir (void) +{ + const char *dir; + dir = getenv("HOME"); + if (dir == NULL) + { + struct passwd *pw = NULL; + pw = getpwuid (getuid ()); + if (pw != NULL) + dir = pw->pw_dir; + else + dir = "/"; + } + if (!the_user_homedir) + the_user_homedir = make_absfilename (dir, NULL); + return the_user_homedir; +} /* Return whether the home dir is the default one. */ int @@ -971,6 +995,7 @@ get_default_pinentry_name (int reset) } names[] = { /* The first entry is what we return in case we found no other pinentry. */ + { user_homedir, "/.guix-profile/bin/pinentry" }, { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S }, #ifdef HAVE_W32_SYSTEM /* Try Gpg4win directory (with bin and without.) */ 'committer'>committer
path: root/tests/guix-system.sh
AgeCommit message (2020-01-17import: opam: Avoid uses of '@@' in tests....Ludovic Courtès
2019-09-07tests: opam: Fix input type in import test....Julien Lepiller
2019-02-05import: opam: Fix conditions....Julien Lepiller
2018-12-172019-04-292018-09-042019-01-21tests: Adjust for removal of 'device' field in <bootloader-configuration>....Ludovic Courtès
2019-01-11services: Deprecate a few more service procedures....Ludovic Courtès
2018-10-18services: dhcp-client: Deprecate 'dhcp-client-service' procedure....Ludovic Courtès
2018-09-07vm: Make UUID computation really deterministic....Ludovic Courtès
2018-05-28system: Remove uses of the 'title' field of <file-system>....Ludovic Courtès
2018-05-19tests: Adjust to new "unbound variable" messages....Ludovic Courtès
2018-04-30guix system: search: Display default Shepherd service names....Ludovic Courtès
2018-03-24tests: Add tests for "guix system disk-image" et al....Chris Marusich
2017-12-06gnu, doc, tests: Use ‘bootloader-configuration’ everywhere....Tobias Geerinckx-Rice
2017-12-04tests: Look for multi-digit column numbers in unbound variable test....Eric Bavier
2017-11-10tests: Adjust to unbound-variable exception printer....Ludovic Courtès
2017-11-08gnu: Improve error reporting of the use-.*modules macros....Ludovic Courtès