Minor bug fixes.

* src/mail.c (gpg_sign): Verify sign result.
(sign_message): Likewise. Free temporary
message on errors.
* src/null.c (null_move_file): Do not remove
file in dry-run mode.
* doc/wydawca.texi: Update.

2 files changed, 54 insertions, 10 deletions

diff --git a/src/mail.c b/src/mail.c
index 756490a..e424017 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -72,12 +72,44 @@ mu_stream_data_read_cb (void *handle, void *buffer, size_t size)
 }
 
 static int
+check_sign_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
+{
+  gpgme_new_signature_t sign;
+  
+  if (result->invalid_signers)
+    {
+      logmsg (LOG_ERR, _("GPGME: invalid signer found: %s"),
+              result->invalid_signers->fpr);
+      return 1;
+    }
+
+  if (!result->signatures)
+    {
+      logmsg (LOG_ERR, _("GPGME: no signatures created"));
+      return 1;
+    }
+
+  for (sign = result->signatures; sign; sign = sign->next)
+    {
+      if (sign->type != type)
+        {
+          logmsg (LOG_ERR, _("GPGME: wrong type of signature created"));
+          return 1;
+        }
+    }
+  /* FIXME: fingerprint? */
+  return 0;
+}
+
+  
+static int
 gpg_sign (gpgme_data_t *output, gpgme_data_t input, const char *sign_keys)
 {
   gpgme_ctx_t ctx;
   gpgme_error_t err = 0;
   gpgme_key_t key;
-
+  int ret;
+  
   err = gpgme_new (&ctx);
   if (err)
     {
@@ -120,17 +152,25 @@ gpg_sign (gpgme_data_t *output, gpgme_data_t input, const char *sign_keys)
 
   err = gpgme_op_sign (ctx, input, *output, GPGME_SIG_MODE_CLEAR);
   if (err)
-    logmsg (LOG_ERR, _("%s: GPGME error: %s"),
-            "gpgme_op_sign",
-            gpgme_strerror (err));
+    {
+      logmsg (LOG_ERR, _("%s: GPGME error: %s"),
+              "gpgme_op_sign",
+              gpgme_strerror (err));
+      ret = 1;
+    }
+  else
+    {
+      ret = check_sign_result (gpgme_op_sign_result (ctx),
+                               GPGME_SIG_MODE_CLEAR);
 #if 0
   /* FIXME: */
-  else if (debug_level > 1)
-    gpgme_debug_info (ctx);
+      if (debug_level > 1)
+        gpgme_debug_info (ctx);
 #endif
-
+    }
+  
   gpgme_release (ctx);
-  return err != 0;
+  return ret;
 }
 
 static int
@@ -188,7 +228,9 @@ sign_message (mu_message_t *pmsg, const char *key)
     }
 
   rc = gpg_sign (&output, input, key);
-
+  if (rc)
+    return 1;
+  
   if (gpgme_data_seek (output, 0, SEEK_SET) == -1)
     {
       logmsg (LOG_ERR, "gpgme_data_seek: %s", strerror (errno));
@@ -234,6 +276,8 @@ sign_message (mu_message_t *pmsg, const char *key)
         }
     }
   
+  if (rc)
+    mu_message_destroy (&newmsg, mu_message_get_owner (msg));
   gpgme_data_release (output);
   free (buf);
 
diff --git a/src/null.c b/src/null.c
index 6a1b0a7..26ccdbf 100644
--- a/src/null.c
+++ b/src/null.c
@@ -25,7 +25,7 @@ null_move_file (struct file_triplet *trp, const struct spool *spool,
     logmsg (LOG_DEBUG, _("spool %s: installing file `%s/%s'"),
             spool->tag, reldir, file_name);
   UPDATE_STATS (STAT_UPLOADS);
-  if (unlink (file_name))
+  if (!dry_run_mode && unlink (file_name))
     {
       logmsg (LOG_ERR, _("cannot unlink %s: %s"),
               file_name, strerror (errno));