* Renamed "dynloader" to "serv_extensions" globally. We don't want people

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 3b81fec3f1fcb67fbf64ba28ac1759a722a9c2da..0a305151b70bb5a15642b68d1d3d6d2714792818 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,10 +1,15 @@
 /*
+ * $Id$
+ *
  * This function reads the citadel.config file.  It should be called at
  * the beginning of EVERY Citadel program.
  *
- * $Id$
  */
 
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <sys/stat.h>
@@ -14,6 +19,8 @@
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
+#include "server.h"
+#include "serv_extensions.h"
 #include "config.h"
 
 struct config config;
@@ -52,13 +59,15 @@ void get_config(void) {
                perror("citadel.config");
                exit(1);
        }
+#ifndef __CYGWIN__
        if (st.st_uid != BBSUID || st.st_mode != (S_IFREG | S_IRUSR | S_IWUSR)) {
                fprintf(stderr, "check the permissions on citadel.config\n");
                exit(1);
        }
+#endif
        fclose(cfp);
 
-       if (config.c_setup_level != REV_LEVEL) {
+       if (config.c_setup_level < REV_MIN) {
                fprintf(stderr, "config: Your data files are out of date.  ");
                fprintf(stderr, "Run setup to update them.\n");
                fprintf(stderr,
@@ -79,14 +88,22 @@ void get_config(void) {
         if (config.c_maxmsglen < 8192)
                 config.c_maxmsglen = 8192;
 
-        /* Default number of worker threads is 15 and the minimum is 5
-         */
-       /* Can't have fewer than two worker threads */
-       if (config.c_worker_threads == 0)
-               config.c_worker_threads = 15;
-       if (config.c_worker_threads < 5)
-               config.c_worker_threads = 5;
-               
+        /* Default lower and upper limits on number of worker threads */
+
+       if (config.c_min_workers < 3)           /* no less than 3 */
+               config.c_min_workers = 5;
+
+       if (config.c_max_workers == 0)                  /* default maximum */
+               config.c_max_workers = 256;
+
+       if (config.c_max_workers < config.c_min_workers)   /* max >= min */
+               config.c_max_workers = config.c_min_workers;
+
+       /* Networking more than once every five minutes just isn't sane */
+       if (config.c_net_freq == 0L)
+               config.c_net_freq = 3600L;      /* once per hour default */
+       if (config.c_net_freq < 300L) 
+               config.c_net_freq = 300L;
 }