security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

gpgconf: create local option file even if a global file exists. 

* tools/gpgconf-comp.c (munge_config_filename): New.
(change_options_program): Call it.
--

In case a system-wide config exists but no local file, the component
returns the name of the system-wide config file and gpgconf tried to
update this file.  This fixes this by detecting the presense of a
system-wide config file.

This applies only to 2.2; the configuration system in 2.3 has been
heavily changed to better handle system-wide configuration files.

GnuPG-bug-id: 5650
This commit is contained in:
Werner Koch 2021-10-22 11:57:24 +02:00
parent 752422a792
commit 5e3eea4b73
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/tools.texi
View File

@ -692,6 +692,10 @@ all options (and the groups they belong to) in the component
the field @var{name} in the output of the @code{--list-components}
command.
Take care if system-wide options are used: gpgconf may not be able to
properly show the options and the listed options may have no actual
effect in case the system-wide options enforced their own settings.
There is one line for each option and each group. First come all
options that are not in any group. Then comes a line describing a
group. Then come all options that belong into each group. Then comes

46
tools/gpgconf-comp.c
View File

@ -2634,6 +2634,51 @@ copy_file (const char *src_name, const char *dst_name)
#endif /* HAVE_W32_SYSTEM */
/* Test whether the config filename stored at FNAMEP is in the global
* config directory. In this case change the filename to use the
* standard filename of the homedir. This shall be used before
* writing a config file to cope wit the case of a missing user config
* file name but an existsing global config file - this would
* otherwise lead to an attempt to write to the global file (which
* will be silently rejected due to insufficient permissions) and not
* the creation of a new user config file. */
static void
munge_config_filename (char **fnamep)
{
char *fname = *fnamep;
char *p1;
int c, rc;
p1 = strrchr (fname, '/');
#ifdef HAVE_W32_SYSTEM
{
char *p2 = strchr (fname, '\\');
if (!p1 && p2)
p1 = p2;
else if (p2 && p2 > p1)
p1 = p2;
}
#endif
if (!p1 || !*p1)
return; /* No directory part - strange but no need for acting. */
c = *p1;
*p1 = 0;
rc = compare_filenames (fname, gnupg_sysconfdir ());
*p1 = c;
if (!rc && p1[1]) /* Sysconfdir - use homedir instead. */
{
char *newfname = xstrconcat (gnupg_homedir (), p1, NULL);
#ifdef HAVE_W32_SYSTEM
for (p1=newfname; *p1; p1++)
if (*p1 == '/')
*p1 = '\\';
#endif
xfree (fname);
*fnamep = newfname;
}
}
/* Create and verify the new configuration file for the specified
* backend and component. Returns 0 on success and -1 on error. This
* function may store pointers to malloced strings in SRC_FILENAMEP,
@ -2995,6 +3040,7 @@ change_options_program (gc_component_t component, gc_backend_t backend,
/* FIXME. Throughout the function, do better error reporting. */
dest_filename = xstrdup (get_config_filename (component, backend));
munge_config_filename (&dest_filename);
src_filename = xasprintf ("%s.%s.%i.new",
dest_filename, GPGCONF_NAME, (int)getpid ());
orig_filename = xasprintf ("%s.%s.%i.bak",