Fix memory leaks, provide config statements for disabling inotify.

* src/config.c: New statement "inotify" (global and
spool-specific).
* src/gpg.c (gpg_verify_signature): Free key when
no longer needed.
(verify_directive_signature): Fix memory leak.
* src/job.c (job_queue_runner): Free the unlinked job.
* src/triplet.c (triplet_lookup): Free key.name.
* src/verify.c (fill_project_name): Return immediately if
trp->blurb is not null.
* src/watcher.c (create_watcher): Ignore spool if its
inotify_enable is false.
(watcher_init): Return immediately if inotify_enable is
false.
* src/wydawca.c (inotify_enable): New global.
* src/wydawca.h: Likewise.

8 files changed, 99 insertions, 52 deletions

diff --git a/src/config.c b/src/config.c
index 66d5fb7..509b0d5 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1155,12 +1155,16 @@ static struct grecs_keyword spool_kw[] = {
     NULL, offsetof(struct spool, dest_url),
     cb_url },
   { "file-sweep-time", N_("interval"), N_("Define file sweep time"),
     grecs_type_string, GRECS_DFLT,
     NULL, offsetof(struct spool, file_sweep_time),
     cb_interval },
+  { "inotify", NULL, N_("Enable or disable inotify for this spool"),
+    grecs_type_bool, GRECS_DFLT,
+    NULL, offsetof(struct spool, inotify_enable), },
+                   
   { "dictionary", N_("ident"), N_("Define data dictionary"),
     grecs_type_section, GRECS_DFLT,
     NULL, offsetof(struct spool, dictionary),
     cb_dictionary, NULL, dictionary_kw },
   { "archive", N_("type: string"), N_("Set up archivation"),
     grecs_type_section, GRECS_DFLT,
@@ -1197,12 +1201,13 @@ cb_spool (enum grecs_callback_command cmd,
                        _("tag must be a string"));
           return 1;
         }
       spool = grecs_zalloc (sizeof (*spool));
       spool->tag = grecs_strdup (value->v.string);
       spool->file_sweep_time = file_sweep_time;
+      spool->inotify_enable = 1;
       for (i = 0; i < NITEMS (spool->dictionary); i++)
         spool->dictionary[i] = default_dictionary[i];
       spool->archive = default_archive_descr;
       *pdata = spool;
       break;
 
@@ -1415,13 +1420,16 @@ static struct grecs_keyword wydawca_kw[] = {
   { "single-process", NULL, N_("Do not spawn subprocesses"),
     grecs_type_bool, GRECS_DFLT, &single_process },
   { "wakeup-interval", N_("time"), N_("Set wake-up interval"),
     grecs_type_string, GRECS_DFLT, &wakeup_interval, 0, cb_interval },
   { "pidfile", N_("file"), N_("Set pid file name"),
     grecs_type_string, GRECS_DFLT, &pidfile },
-
+  
+  { "inotify", NULL, N_("Enable or disable inotify support"),
+    grecs_type_bool, GRECS_DFLT, &inotify_enable },
+  
   { "user", N_("name"), N_("Run with UID and GID of this user"),
     grecs_type_string, GRECS_DFLT, NULL, 0, cb_user },
   { "group", NULL, N_("Retain these supplementary groups"),
     grecs_type_string, GRECS_LIST, NULL, 0, cb_supp_groups },
 
   { "min-version", N_("major.minor"),
diff --git a/src/gpg.c b/src/gpg.c
index 8979e9c..814be6f 100644
--- a/src/gpg.c
+++ b/src/gpg.c
@@ -144,83 +144,93 @@ create_gpg_homedir ()
     logmsg (LOG_DEBUG, _("GNUPG home directory: %s"), temp_homedir);
   setenv ("GNUPGHOME", temp_homedir, 1);
   return 0;
 }
 
 static int
+checksig (gpgme_signature_t sig, const char *uid, struct file_triplet *trp)
+{
+  switch (gpg_err_code (sig->status))
+    {
+    case GPG_ERR_NO_ERROR:
+      if (debug_level)
+        logmsg (LOG_NOTICE, _("Good signature from %s"), uid);
+      trp->uploader = uploader_find_frp (trp->uploader_list, sig->fpr);
+      if (!trp->uploader)
+        {
+          logmsg (LOG_ERR,
+                  _("good signature from %s, "
+                    "but the uploader info for %s not found"),
+                  uid, sig->fpr);
+          return 1;
+        }
+      break;
+
+    case GPG_ERR_BAD_SIGNATURE:
+      UPDATE_STATS (STAT_BAD_SIGNATURE);
+      logmsg (LOG_ERR, _("BAD signature from %s"), uid);
+      return 0;
+
+    case GPG_ERR_NO_PUBKEY:
+      UPDATE_STATS (STAT_ACCESS_VIOLATIONS);
+      logmsg (LOG_ERR, _("No public key"));
+      return 0;
+
+    case GPG_ERR_NO_DATA:
+      UPDATE_STATS (STAT_BAD_TRIPLETS);
+      logmsg (LOG_ERR, _("No signature"));
+      return 0;
+
+    case GPG_ERR_SIG_EXPIRED:
+      UPDATE_STATS (STAT_BAD_SIGNATURE);
+      logmsg (LOG_ERR, _("Expired signature from %s"), uid);
+      return 0;
+
+    case GPG_ERR_KEY_EXPIRED:
+      UPDATE_STATS (STAT_BAD_SIGNATURE);
+      logmsg (LOG_ERR, _("Key expired (%s)"), uid);
+      return 0;
+      
+    default:
+      logmsg (LOG_ERR, _("Unknown signature error"));
+      return 0;
+    }
+  return -1;
+}
+
+static int
 gpg_verify_signature (gpgme_ctx_t ctx, gpgme_signature_t sig,
                       struct file_triplet *trp)
 {
   if (!sig)
     return 0;
 
   for (; sig; sig = sig->next)
     {
       const char *uid;
       gpgme_key_t key;
-
+      int rc;
+      
       if (gpgme_get_key (ctx, sig->fpr, &key, 0) == GPG_ERR_NO_ERROR)
         uid = key->uids->uid;
       else
         uid = sig->fpr;
-
-      switch (gpg_err_code (sig->status))
-        {
-        case GPG_ERR_NO_ERROR:
-          if (debug_level)
-            logmsg (LOG_NOTICE, _("Good signature from %s"), uid);
-          trp->uploader = uploader_find_frp (trp->uploader_list, sig->fpr);
-          if (!trp->uploader)
-            {
-              logmsg (LOG_ERR,
-                      _("good signature from %s, "
-                        "but the uploader info for %s not found"),
-                      uid, sig->fpr);
-              return 1;
-            }
-          break;
-
-        case GPG_ERR_BAD_SIGNATURE:
-          UPDATE_STATS (STAT_BAD_SIGNATURE);
-          logmsg (LOG_ERR, _("BAD signature from %s"), uid);
-          return 0;
-
-        case GPG_ERR_NO_PUBKEY:
-          UPDATE_STATS (STAT_ACCESS_VIOLATIONS);
-          logmsg (LOG_ERR, _("No public key"));
-          return 0;
-
-        case GPG_ERR_NO_DATA:
-          UPDATE_STATS (STAT_BAD_TRIPLETS);
-          logmsg (LOG_ERR, _("No signature"));
-          return 0;
-
-        case GPG_ERR_SIG_EXPIRED:
-          UPDATE_STATS (STAT_BAD_SIGNATURE);
-          logmsg (LOG_ERR, _("Expired signature from %s"), uid);
-          return 0;
-
-        case GPG_ERR_KEY_EXPIRED:
-          UPDATE_STATS (STAT_BAD_SIGNATURE);
-          logmsg (LOG_ERR, _("Key expired (%s)"), uid);
-          return 0;
-
-        default:
-          logmsg (LOG_ERR, _("Unknown signature error"));
-          return 0;
-        }
+      rc = checksig (sig, uid, trp);
+      gpgme_key_unref (key);
+      if (rc != -1)
+        return rc;
     }
   return 1;
 }
 
 /* Verify the directive file from TRP using public key PUBKEY */
 int
 verify_directive_signature (struct file_triplet *trp)
 {
   gpgme_ctx_t ctx;
-  gpgme_data_t key_data, directive_data, plain;
+  gpgme_data_t key_data, directive_data, plain = NULL;
   gpgme_error_t ec;
   int rc;
   struct uploader_info *uptr;
 
   create_gpg_homedir ();