-disable extractor should also imply not using the filename as a keyword

diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c
index 5119de4c59ae52b9833761040bb96b2f9f5226fc..0b6d407ab319a338587f4cc3ba6aece7ce1775d7 100644 (file)
--- a/src/fs/fs_publish_ksk.c
+++ b/src/fs/fs_publish_ksk.c
@@ -188,7 +188,7 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++];
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing under keyword `%s'\n",
-              keyword);
+              &keyword[1]);
   /* first character of keyword indicates if it is
    * mandatory or not -- ignore for hashing */
   GNUNET_CRYPTO_hash (&keyword[1], strlen (&keyword[1]), &key);

diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index 50f507d934bae26ffe1e0a087249aab0fa59bacd..84d58138490f664de3069d83d85624f4fb314409 100644 (file)
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -291,6 +291,11 @@ publish_inspector (void *cls, struct GNUNET_FS_FileInformation *fi,
   }
   if (!do_disable_creation_time)
     GNUNET_CONTAINER_meta_data_add_publication_date (m);
+  if (disable_extractor)
+  {
+    GNUNET_FS_uri_destroy (*uri);
+    *uri = NULL;
+  }
   if (extract_only)
   {
     fn = GNUNET_CONTAINER_meta_data_get_by_type (m,