[git] GpgOL - branch, master, updated. gpgol-2.3.0-66-gc7a4f87

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  c7a4f879bd392aac2f471358a2af4b8d3105c76b (commit)
      from  68191e53049bf88aab4dbbab5427b5d0c90ead05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c7a4f879bd392aac2f471358a2af4b8d3105c76b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Oct 1 09:17:53 2018 +0200

    Add specific option for auto-key-retrieve
    
    * src/common_inde.p (opt): Add it.
    * src/main.c (read_options): Read it.
    * src/parsecontroller.common_inde (ParseController::parse): Use it.
    
    --
    This is a new default off option. With the delays coming
    from many SKS-Keyservers we can't use it in good consicence
    yet it is just too slow if communicating with people that
    have not published their keys.

diff --git a/src/common_indep.h b/src/common_indep.h
index 8df77aa..cfe5e28 100644
--- a/src/common_indep.h
+++ b/src/common_indep.h
@@ -202,6 +202,7 @@ struct
   int sync_enc;              /* Disabed async encryption */
   int prefer_smime;          /* S/MIME prefered when autoresolving */
   int smime_html_warn_shown; /* Flag to save if unsigned smime warning was shown */
+  int autoretrieve;           /* Use --auto-key-retrieve. */
 
   /* The forms revision number of the binary.  */
   int forms_revision;
diff --git a/src/main.c b/src/main.c
index 30f22f7..e773cb6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -317,6 +317,7 @@ read_options (void)
   opt.reply_crypt = get_conf_bool ("replyCrypt", 1);
   opt.prefer_smime = get_conf_bool ("preferSmime", 0);
   opt.autoresolve = get_conf_bool ("autoresolve", 1);
+  opt.autoretrieve = get_conf_bool ("autoretrieve", 0);
   opt.automation = get_conf_bool ("automation", 1);
   opt.autosecure = get_conf_bool ("autosecure", 1);
   opt.autotrust = get_conf_bool ("autotrust", 0);
@@ -329,6 +330,7 @@ read_options (void)
       opt.autosecure = 0;
       opt.autoresolve = 0;
       opt.autotrust = 0;
+      opt.autoretrieve = 0;
     }
 
   /* Hidden options  */
diff --git a/src/parsecontroller.cpp b/src/parsecontroller.cpp
index 1275020..b6428bc 100644
--- a/src/parsecontroller.cpp
+++ b/src/parsecontroller.cpp
@@ -341,7 +341,7 @@ ParseController::parse()
     }
 
   /* Maybe a different option for this ? */
-  if (opt.autoresolve)
+  if (opt.autoretrieve)
     {
       ctx->setFlag("auto-key-retrieve", "1");
     }

-----------------------------------------------------------------------

Summary of changes:
 src/common_indep.h      | 1 +
 src/main.c              | 2 ++
 src/parsecontroller.cpp | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org