Imported Upstream version 2.4.5p1

[debian/amanda] / client-src / sendsize.c

diff --git a/client-src/sendsize.c b/client-src/sendsize.c
index b7bf68815c8a3298806f372738a169d05eacd1ad..106b35bc62016ad26df85c174db72d35f94dff16 100644 (file)
--- a/client-src/sendsize.c
+++ b/client-src/sendsize.c
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /* 
- * $Id: sendsize.c,v 1.97.2.13.4.6.2.23.2.3 2005/04/06 12:31:04 martinea Exp $
+ * $Id: sendsize.c,v 1.97.2.13.4.6.2.23.2.5 2005/09/20 21:31:52 jrjackson Exp $
  *
  * send estimated backup sizes using dump
  */
@@ -119,7 +119,6 @@ char **argv;
     char *s, *fp;
     int ch;
     char *err_extra = NULL;
-    int fd;
     unsigned long malloc_hist_1, malloc_size_1;
     unsigned long malloc_hist_2, malloc_size_2;
     int done;
@@ -129,16 +128,7 @@ char **argv;
 
     /* initialize */
 
-    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("sendsize");
@@ -557,6 +547,7 @@ disk_estimates_t *est;
 #ifdef SAMBA_CLIENT
          if (est->amdevice[0] == '/' && est->amdevice[1] == '/')
            dbprintf(("%s: Can't use CALCSIZE for samba estimate: %s %s\n",
+                     debug_prefix_time(NULL),
                      est->amname, est->dirname));
          else
 #endif