diff options
| -rw-r--r-- | common/homedir.c | 3 | ||||
| -rw-r--r-- | tools/gpgconf.c | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/common/homedir.c b/common/homedir.c index 4425d7811..61d3edfb4 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -305,6 +305,9 @@ default_homedir (void) { char *tmp, *p; + /* This is deprecated; gpgconf --list-dirs prints a + * warning if the homedir has been taken from the + * registry. */ tmp = read_w32_registry_string (NULL, GNUPG_REGISTRY_DIR, "HomeDir"); diff --git a/tools/gpgconf.c b/tools/gpgconf.c index a0cd97f60..596aa957d 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -274,6 +274,20 @@ list_dirs (estream_t fp, char **names) xfree (tmp); } + + +#ifdef HAVE_W32_SYSTEM + tmp = read_w32_registry_string (NULL, + GNUPG_REGISTRY_DIR, + "HomeDir"); + if (tmp) + { + es_fflush (fp); + log_info ("Warning: homedir taken from registry key (%s %s)\n", + GNUPG_REGISTRY_DIR, "HomeDir"); + xfree (tmp); + } +#endif /*HAVE_W32_SYSTEM*/ } |