X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Fholding.c;h=26766316dac233c22ef30bfac247730bb65e8324;hb=2451141bb42e8e8d981b4843ea73f719fd544a22;hp=0d8cb82dc7d801a7f1a7b1320ff60f24323eca62;hpb=d5853102f67d85d8e169f9dbe973ad573306c215;p=debian%2Famanda

diff --git a/server-src/holding.c b/server-src/holding.c
index 0d8cb82..2676631 100644
--- a/server-src/holding.c
+++ b/server-src/holding.c
@@ -32,6 +32,7 @@
 #include "amanda.h"
 #include "util.h"
 #include "holding.h"
+#include "diskfile.h"
 #include "fileheader.h"
 #include "logfile.h"
 
@@ -516,7 +517,6 @@ holding_get_files_for_flush(
     GSList *file_list, *file_elt;
     GSList *date;
     int date_matches;
-    disk_t *dp;
     dumpfile_t file;
     GSList *result_list = NULL;
 
@@ -551,15 +551,6 @@ holding_get_files_for_flush(
             continue;
 	}
 
-        /* check that the hostname and disk are in the disklist */
-        dp = lookup_disk(file.name, file.disk);
-        if (dp == NULL) {
-	    dbprintf(_("%s: disk %s:%s not in database, skipping it."),
-                        (char *)file_elt->data, file.name, file.disk);
-	    dumpfile_free_data(&file);
-            continue;
-        }
-
         /* passed all tests -- we'll flush this file */
         result_list = g_slist_insert_sorted(result_list, 
 	    stralloc(file_elt->data), 
@@ -567,7 +558,7 @@ holding_get_files_for_flush(
 	dumpfile_free_data(&file);
     }
 
-    if (file_list) g_slist_free_full(file_list);
+    if (file_list) slist_free_full(file_list, g_free);
 
     return result_list;
 }
@@ -593,7 +584,7 @@ holding_get_all_datestamps(void)
 	dumpfile_free_data(&dfile);
     }
 
-    g_slist_free_full(all_files);
+    slist_free_full(all_files, g_free);
 
     return datestamps;
 }
@@ -952,9 +943,11 @@ rename_tmp_holding(
 		dumpfile_free_data(&file);
 		amfree(filename);
 		amfree(filename_tmp);
+		free(header);
 		close(fd);
 		return 0;
 	    }
+	    free(header);
 	    close(fd);
 	}
 	filename = newstralloc(filename, file.cont_filename);