[git] GpgOL - branch, master, updated. gpgol-2.3.2-13-gcf221af

[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  cf221afd9d59b803338206544927116c6ca01259 (commit)
       via  a31338698ae7002f9e9cbc87a8a8aa3dbd3ae0c7 (commit)
      from  dfd9fa3c85cd51353314d5da73587ed4fa54b3ab (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 cf221afd9d59b803338206544927116c6ca01259
Author: Andre Heinecke <aheinecke at gnupg.org>
Date:   Mon Jan 14 10:15:25 2019 +0100

    Fix forwarding of sent mails
    
    * src/cryptcontroller.cpp (CryptController::update_mail_mapi):
    Remove an existing MOSSTMPL if available.
    
    --
    Without this the MOSSTMPL was kept and we then had two
    or more MOSSTMPLs. This resulted in undefined / buggy
    behavior.
    
    GnuPG-Bug-Id: T4321

diff --git a/src/cryptcontroller.cpp b/src/cryptcontroller.cpp
index 217bc87..2f7bae5 100644
--- a/src/cryptcontroller.cpp
+++ b/src/cryptcontroller.cpp
@@ -1019,6 +1019,25 @@ CryptController::update_mail_mapi ()
 
   mapi_attach_item_t *att_table = mapi_create_attach_table (message, 0);
 
+  /* When we forward e.g. a crypto mail we have sent the message
+     has a MOSSTEMPL. We need to remove that. T4321 */
+  for (ULONG pos=0; !att_table[pos].end_of_table; pos++)
+    {
+      if (att_table[pos].attach_type == ATTACHTYPE_MOSSTEMPL)
+        {
+          log_debug ("%s:%s: Found existing moss attachment at "
+                     "pos %i removing it.", SRCNAME, __func__,
+                     att_table[pos].mapipos);
+          if (message->DeleteAttach (att_table[pos].mapipos, 0,
+                                     nullptr, 0) != S_OK)
+            {
+              log_error ("%s:%s: Failed to remove attachment.",
+                         SRCNAME, __func__);
+            }
+
+        }
+    }
+
   // Set up the sink object for our MSOXSMIME attachment.
   struct sink_s sinkmem;
   sink_t sink = &sinkmem;

commit a31338698ae7002f9e9cbc87a8a8aa3dbd3ae0c7
Author: Andre Heinecke <aheinecke at gnupg.org>
Date:   Mon Jan 14 10:15:14 2019 +0100

    Fix minor typo
    
    --

diff --git a/src/categorymanager.cpp b/src/categorymanager.cpp
index 21f8daf..d641d77 100644
--- a/src/categorymanager.cpp
+++ b/src/categorymanager.cpp
@@ -225,7 +225,7 @@ CategoryManager::removeCategory (Mail *mail, const std::string &category)
     }
   if (remove_category (mail->item (), category.c_str (), true))
     {
-      log_debug ("%s:%s Failed to remvoe category.",
+      log_debug ("%s:%s Failed to remove category.",
                  SRCNAME, __func__);
     }
   d->unregisterCategory (mail->storeID (), category.c_str ());

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

Summary of changes:
 src/categorymanager.cpp |  2 +-
 src/cryptcontroller.cpp | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)


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