aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine-gpgconf.c
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2017-04-05 16:23:48 +0000
committerAndre Heinecke <[email protected]>2017-05-03 08:14:05 +0000
commitdf4eb611e33dcab7bebf07b13734c7db7ccf40da (patch)
treeb440b08fc868ab2c2fb1a4ed23bc60fb85d4ffa5 /src/engine-gpgconf.c
parentqt, cpp: Add additional copyright BSI notes (diff)
downloadgpgme-df4eb611e33dcab7bebf07b13734c7db7ccf40da.tar.gz
gpgme-df4eb611e33dcab7bebf07b13734c7db7ccf40da.zip
core: Don't split gpgconf strings on comma
* src/engine-gpgconf.c (gpgconf_parse_option): Don't split strings on comma. -- This only affects values where the main type is string. Values with the alt_type string but another main type are still split to keep lists (e.g. groups) working.
Diffstat (limited to 'src/engine-gpgconf.c')
-rw-r--r--src/engine-gpgconf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index 6f7c8ac0..af5f1103 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -399,7 +399,7 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
gpgme_conf_arg_t *arg_p, char *line)
{
gpgme_error_t err;
- char *mark;
+ char *mark = NULL;
if (!line[0])
return 0;
@@ -408,7 +408,8 @@ gpgconf_parse_option (gpgme_conf_opt_t opt,
{
gpgme_conf_arg_t arg;
- mark = strchr (line, ',');
+ if (opt->type != GPGME_CONF_STRING)
+ mark = strchr (line, ',');
if (mark)
*mark = '\0';