merged in ENGINE-339
authorKrista Bennett <krista@pep-project.org>
Thu, 25 Jan 2018 15:12:01 +0100
changeset 2453327c7fddcb8e
parent 2450 719ec5a51303
parent 2452 43625ed353b1
child 2456 713e5eead807
child 2459 5c0f7385757d
merged in ENGINE-339
     1.1 --- a/src/pgp_gpg.c	Thu Jan 25 12:24:56 2018 +0100
     1.2 +++ b/src/pgp_gpg.c	Thu Jan 25 15:12:01 2018 +0100
     1.3 @@ -251,6 +251,9 @@
     1.4          stringlist_add(conf_keys, "ignore-time-conflict");
     1.5          stringlist_add(conf_values, "");
     1.6  
     1.7 +        stringlist_add(conf_keys, "allow-freeform-uid");
     1.8 +        stringlist_add(conf_values, "");
     1.9 +
    1.10          bResult = ensure_config_values(conf_keys, conf_values, gpg_conf());
    1.11  
    1.12          free_stringlist(conf_keys);