[git] GpgOL - branch, master, updated. gpgol-1.3.0-37-gb879f5b

[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  b879f5bafe905869d0d6e01c76f125ce954a6cfe (commit)
      from  01feeb204280bf3055a2d1b5f005f87e7153e2ef (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 b879f5bafe905869d0d6e01c76f125ce954a6cfe
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Dec 16 17:30:06 2015 +0100

    Fix encrypt only when protocol is provided
    
    * src/engine-assuan.c (op_assuan_encrypt): Add codepath for
     protocol provided and sign not set.
    
    --
    This codepath was just missing. It's used now if S/MIME support
    is disabled.
    
    GnuPG-Bug-Id: 2191

diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index ffb8cee..988258b 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -1682,7 +1682,7 @@ op_assuan_encrypt (protocol_t protocol,
           goto leave;
         }
     }
-  else if ((flags & ENGINE_FLAG_SIGN_FOLLOWS))
+  else
     {
       if ( !protocol_name )
         {
@@ -1690,7 +1690,9 @@ op_assuan_encrypt (protocol_t protocol,
           goto leave;
         }
 
-      snprintf (line, sizeof line, "PREP_ENCRYPT --protocol=%s --expect-sign",
+      snprintf (line, sizeof line, (flags & ENGINE_FLAG_SIGN_FOLLOWS)
+                ? "PREP_ENCRYPT --protocol=%s --expect-sign"
+                : "PREP_ENCRYPT --protocol=%s",
                 protocol_name);
       err = assuan_transact (ctx, line, NULL, NULL, NULL, NULL, NULL, NULL);
       if (err)

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

Summary of changes:
 src/engine-assuan.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


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