[git] GpgOL - branch, master, updated. gpgol-2.0.5-11-g17c6532

by Andre Heinecke cvs at cvs.gnupg.org
Thu Jan 11 13:32:43 CET 2018


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  17c6532db77badd4111978b35b922ad6331d897b (commit)
       via  754a37dfc0076a01dd35cb1b62a3516631ba042e (commit)
      from  39f1abce90094bdbb03c38bb3aadf0db1d8147e6 (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 17c6532db77badd4111978b35b922ad6331d897b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Jan 11 13:30:28 2018 +0100

    Increase Verbosity for issue3656
    
    --
    This turns up logging around the encryption. As this puts
    the full body of an encrypted mail in the debug log it should
    not be part of a release.
    
    GnuPG-Bug-Id: T3656

diff --git a/src/mailitem-events.cpp b/src/mailitem-events.cpp
index 88bac05..35d9c10 100644
--- a/src/mailitem-events.cpp
+++ b/src/mailitem-events.cpp
@@ -332,8 +332,8 @@ EVENT_SINK_INVOKE(MailItemEvents)
              If this encryption is successful and we pass the send
              as then the encrypted data is sent.
            */
-          log_oom_extra ("%s:%s: Send : %p",
-                         SRCNAME, __func__, m_mail);
+          log_debug ("%s:%s: Send : %p item %p",
+                     SRCNAME, __func__, m_object, m_mail);
           if (!m_mail->needs_crypto ())
             {
              log_debug ("%s:%s: No crypto neccessary. Passing send for unencrypted %p",
@@ -349,6 +349,14 @@ EVENT_SINK_INVOKE(MailItemEvents)
            }
           m_mail->update_oom_data ();
           m_mail->set_needs_encrypt (true);
+          log_debug ("%s:%s: Send : %p item %p needs encrypt. Calling save.",
+                     SRCNAME, __func__, m_mail, m_object);
+          log_debug ("%s:%s: Send : %p Setting uuid.",
+                     SRCNAME, __func__, m_mail);
+          m_mail->set_uuid ();
+          log_debug ("%s:%s: Send : %p has subject: %s.",
+                     SRCNAME, __func__, m_mail, m_mail->get_subject ().c_str());
+
           invoke_oom_method (m_object, "Save", NULL);
           if (m_mail->crypto_successful ())
             {
@@ -381,8 +389,9 @@ EVENT_SINK_INVOKE(MailItemEvents)
                       log_debug ("%s:%s: Wipe succeded. %p.",
                                  SRCNAME, __func__, m_object);
 
-                      log_debug ("%s:%s: Passing send event for message %p.",
-                                SRCNAME, __func__, m_object);
+                      const auto uuid = m_mail->get_uuid ();
+                      log_debug ("%s:%s: Passing send event for message %p uuid: %s.",
+                                SRCNAME, __func__, m_object, uuid.empty() ? "null" : uuid.c_str ());
                       break;
                     }
                   log_debug ("%s:%s: Cancel send for %p.",
@@ -400,22 +409,22 @@ EVENT_SINK_INVOKE(MailItemEvents)
                   *(parms->rgvarg[0].pboolVal) = VARIANT_TRUE;
                   return S_OK;
                 }
-              log_debug ("%s:%s: Passing send event for message %p.",
-                         SRCNAME, __func__, m_object);
+              log_debug ("%s:%s: Passing send event for encrypted message %p item %p.",
+                         SRCNAME, __func__, m_object, m_mail);
               break;
             }
           else
             {
-              log_debug ("%s:%s: Message %p cancelling send - crypto failed.",
-                         SRCNAME, __func__, m_object);
+              log_debug ("%s:%s: Message %p cancelling send - crypto failed item %p.",
+                         SRCNAME, __func__, m_object, m_mail);
               *(parms->rgvarg[0].pboolVal) = VARIANT_TRUE;
             }
           return S_OK;
         }
       case Write:
         {
-          log_oom_extra ("%s:%s: Write : %p",
-                         SRCNAME, __func__, m_mail);
+          log_debug ("%s:%s: Write : %p",
+                     SRCNAME, __func__, m_mail);
           /* This is a bit strange. We sometimes get multiple write events
              without a read in between. When we access the message in
              the second event it fails and if we cancel the event outlook
@@ -454,20 +463,29 @@ EVENT_SINK_INVOKE(MailItemEvents)
               *(parms->rgvarg[0].pboolVal) = VARIANT_TRUE;
             }
 
-          log_debug ("%s:%s: Passing write event.",
-                     SRCNAME, __func__);
+          const auto uuid = m_mail->get_uuid ();
+          log_debug ("%s:%s: Passing write event for message %p mailitem %p uuid: %s subject: %s",
+                     SRCNAME, __func__, m_object, m_mail, uuid.empty() ? "null" : uuid.c_str (),
+                     m_mail->get_subject ().c_str());
           m_mail->set_needs_save (false);
           break;
         }
       case AfterWrite:
         {
-          log_oom_extra ("%s:%s: AfterWrite : %p",
+          log_debug ("%s:%s: AfterWrite : %p",
                          SRCNAME, __func__, m_mail);
           if (m_mail->needs_encrypt ())
             {
+              log_debug ("%s:%s: Mail needs encrypt: %p",
+                             SRCNAME, __func__, m_mail);
               m_mail->encrypt_sign ();
               return S_OK;
             }
+          else
+            {
+              log_debug ("%s:%s: Mail does not need encrypt: %p",
+                         SRCNAME, __func__, m_mail);
+            }
           break;
         }
       case Close:
diff --git a/src/mimemaker.cpp b/src/mimemaker.cpp
index 057df95..0bf0637 100644
--- a/src/mimemaker.cpp
+++ b/src/mimemaker.cpp
@@ -86,6 +86,8 @@ sink_std_write (sink_t sink, const void *data, size_t datalen)
   if (!data)
     return 0;  /* Flush - nothing to do here.  */
 
+  log_debug ("Sink write: %.*s", datalen, (char*)data);
+
   hr = stream->Write(data, datalen, NULL);
   if (hr)
     {

commit 754a37dfc0076a01dd35cb1b62a3516631ba042e
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Jan 11 13:30:17 2018 +0100

    Update NEWS
    
    --

diff --git a/NEWS b/NEWS
index fa6a50f..828116d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,17 @@
-Noteworthy changes for version 2.0.6 (unreleased)
+Noteworthy changes for version 2.0.6 (2018-01-11)
 =================================================
 
+ * PGP/Inline sending is now compatible with Microsoft Exchange
+ Online. (T3662)
+
+ * A bug that caused encrypted mails not to be displayed has been
+ fixed. (T3537)
+
+ * A bug that caused drafted mails not to encrypt the correct
+ content has been fixed. (T3419)
+
+ * The recipient lookup for Exchange addresses has been slightly
+ improved.
 
 Noteworthy changes for version 2.0.5 (2017-12-08)
 =================================================

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

Summary of changes:
 NEWS                    | 13 ++++++++++++-
 src/mailitem-events.cpp | 44 +++++++++++++++++++++++++++++++-------------
 src/mimemaker.cpp       |  2 ++
 3 files changed, 45 insertions(+), 14 deletions(-)


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




More information about the Gnupg-commits mailing list