Imported Debian patch 2.4.5p1-2

[debian/amanda] / server-src / amflush.c

diff --git a/server-src/amflush.c b/server-src/amflush.c
index 73ff0308cf9257d2d93d5ba89c5aaa4d34210620..c8d5a4a428221e588ab6958be46e5e77d88abe4a 100644 (file)
--- a/server-src/amflush.c
+++ b/server-src/amflush.c
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: amflush.c,v 1.41.2.13.4.6.2.10 2004/04/23 11:44:57 martinea Exp $
+ * $Id: amflush.c,v 1.41.2.13.4.6.2.9.2.3 2005/09/20 21:31:52 jrjackson Exp $
  *
  * write files from work directory onto tape
  */
@@ -68,7 +68,6 @@ char **main_argv;
     char *dumpuser;
     char **datearg = NULL;
     int nb_datearg = 0;
-    int fd;
     char *conffile;
     char *conf_diskfile;
     char *conf_tapelist;
@@ -85,16 +84,7 @@ char **main_argv;
     char date_string[100];
     time_t today;
 
-    for(fd = 3; fd < FD_SETSIZE; fd++) {
-       /*
-        * Make sure nobody spoofs us with a lot of extra open files
-        * that would cause an open we do to get a very high file
-        * descriptor, which in turn might be used as an index into
-        * an array (e.g. an fd_set).
-        */
-       close(fd);
-    }
-
+    safe_fd(-1, 0);
     safe_cd();
 
     set_pname("amflush");
@@ -226,6 +216,12 @@ char **main_argv;
        exit(1);
     }
 
+    holding_list = get_flush(datestamp_list, NULL, 1, 0);
+    if(holding_list->first == NULL) {
+       printf("Could not find any valid dump image, check directory.\n");
+       exit(1);
+    }
+
     if(!batch) confirm();
 
     for(dp = diskqp->head; dp != NULL; dp = dp->next) {
@@ -269,7 +265,6 @@ char **main_argv;
     }
     driver_stream = fdopen(driver_pipe[1], "w");
 
-    holding_list = get_flush(datestamp_list, NULL, 1, 0);
     for(holding_file=holding_list->first; holding_file != NULL;
                                   holding_file = holding_file->next) {
        get_dumpfile(holding_file->name, &file);