1 files changed, 8 insertions, 2 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 6698b329..18f81e7c 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -485,7 +485,13 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
         char fnURL[PATH_MAX + 1], dummy[2];
         size_t len;
 
-        ren = ECRS_suggestFilename(fn);
+        len = strlen(ln);
+        /* Don't change the name of GNUnet directories (.gnd) */
+        if (len >= 4 && strcmp(ln + len - 4, ".gnd") != 0)
+          ren = ECRS_suggestFilename(fn);
+        else
+          ren = NULL;
+          
         newFn = strrchr(ren ? ren : ln, DIR_SEPARATOR) + 1;
 
         dstPath = getFileName("FS",
@@ -529,7 +535,7 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
         fnURL[len] = 0;
         
         /* avoid directory traversal */
-        while(dotdot = strstr("../")) {
+        while(dotdot = strstr(dstFile, "../")) {
           dotdot[0] = '_';
           dotdot[1] = '_';
         }