Fix calculating Config.Swap.maxSize after a reconfigure

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 4f6431544deca1ef3cfb723a373eb8a80d745a24..b87150c9acad4d08ed1372debb22bd94e6a475e0 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.cc,v 1.259 1998/03/17 05:12:34 wessels Exp $
+ * $Id: cache_cf.cc,v 1.260 1998/03/20 09:34:45 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -189,12 +189,16 @@ static void
 configDoConfigure(void)
 {
     LOCAL_ARRAY(char, buf, BUFSIZ);
+    int i;
     memset(&Config2, '\0', sizeof(SquidConfig2));
     /* init memory as early as possible */
     memConfigure();
     /* Sanity checks */
     if (Config.cacheSwap.swapDirs == NULL)
        fatal("No cache_dir's specified in config file");
+    /* calculate Config.Swap.maxSize */
+    for (i = 0; i < Config.cacheSwap.n_configured; i++)
+       Config.Swap.maxSize += Config.cacheSwap.swapDirs[i].max_size;
     if (Config.Swap.maxSize < (Config.Mem.maxSize >> 10))
        fatal("cache_swap is lower than cache_mem");
     if (Config.Announce.period < 1) {
@@ -592,7 +596,6 @@ parse_cachedir(cacheSwap * swap)
     tmp->map = file_map_create(MAX_FILES_PER_DIR);
     tmp->swaplog_fd = -1;
     swap->n_configured++;
-    Config.Swap.maxSize += size;
 }
 
 static void