Merged in default ENGINE-329
authorKrista Bennett <krista@pep-project.org>
Thu, 25 Jan 2018 15:50:21 +0100
branchENGINE-329
changeset 2456713e5eead807
parent 2451 4de19faa36b3
parent 2453 327c7fddcb8e
child 2457 51a4829805b9
Merged in default
src/pgp_gpg.c
     1.1 --- a/src/pgp_gpg.c	Thu Jan 25 14:10:02 2018 +0100
     1.2 +++ b/src/pgp_gpg.c	Thu Jan 25 15:50:21 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);