adding fs/ to all default directory names relating to file sharing

diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index 48c8b520945a2e25202138954dba9cf14ab5b5c8..0c1a5895bda48e6227c6893d61f3b43901782ace 100644 (file)
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,10 +1,10 @@
 [fs]
 AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
+INDEXDB = $SERVICEHOME/fs/idxinfo.lst
+TRUST = $SERVICEHOME/fs/credit/
+IDENTITY_DIR = $SERVICEHOME/fs/identities/
+STATE_DIR = $SERVICEHOME/fs/persistence/
+UPDATE_DIR = $SERVICEHOME/fs/updates/
 @UNIXONLY@ PORT = 2094
 HOSTNAME = localhost
 HOME = $SERVICEHOME

diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 0efbc7964943af16515b0546f2ee132c1a32eded..d718acb6540558e617343db8eae095ca5873d9ef 100644 (file)
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -1711,6 +1711,8 @@ GNUNET_FS_download_sync_ (struct GNUNET_FS_DownloadContext *dc)
   char *fn;
   char *dir;
 
+  if (0 != (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE))
+    return; /* we don't sync probes */
   if (NULL == dc->serialization)
   {
     dir = get_download_sync_filename (dc, "", "");