* Variable names, comments, documentation, etc... removed the acronym 'BBS'

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 978e20693b1b4c51c76395339422666791239445..8562f3472f213f4e4ddbe2113d227464c38a60e0 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,10 +19,12 @@
 #include <string.h>
 #include <limits.h>
 #include "citadel.h"
+#include "server.h"
+#include "serv_extensions.h"
 #include "config.h"
 
 struct config config;
-char bbs_home_directory[PATH_MAX] = BBSDIR;
+char ctdl_home_directory[PATH_MAX] = CTDLDIR;
 int home_specified = 0;
 
 /*
@@ -29,12 +36,12 @@ void get_config(void) {
        FILE *cfp;
        struct stat st;
 
-       if (chdir(home_specified ? bbs_home_directory : BBSDIR) != 0) {
+       if (chdir(home_specified ? ctdl_home_directory : CTDLDIR) != 0) {
                fprintf(stderr,
                        "This program could not be started.\n"
                        "Unable to change directory to %s\n"
                        "Error: %s\n",
-                       (home_specified ? bbs_home_directory : BBSDIR),
+                       (home_specified ? ctdl_home_directory : CTDLDIR),
                        strerror(errno));
                exit(1);
        }
@@ -43,7 +50,7 @@ void get_config(void) {
                fprintf(stderr, "This program could not be started.\n"
                        "Unable to open %s/citadel.config\n"
                        "Error: %s\n",
-                       (home_specified ? bbs_home_directory : BBSDIR),
+                       (home_specified ? ctdl_home_directory : CTDLDIR),
                        strerror(errno));
                exit(1);
        }
@@ -52,13 +59,15 @@ void get_config(void) {
                perror("citadel.config");
                exit(1);
        }
-       if (st.st_uid != BBSUID || st.st_mode != (S_IFREG | S_IRUSR | S_IWUSR)) {
+#ifndef __CYGWIN__
+       if (st.st_uid != CTDLUID || 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,
@@ -71,11 +80,12 @@ void get_config(void) {
                exit(1);
        }
 
-        /* Default maximum message length is 'unlimited' (max int)
-         * and the minimum is 8192
+        /* Default maximum message length is 10 megabytes.  This is site
+        * configurable.  Also check to make sure the limit has not been
+        * set below 8192 bytes.
          */
         if (config.c_maxmsglen <= 0)
-                config.c_maxmsglen = INT_MAX;
+                config.c_maxmsglen = 10485760;
         if (config.c_maxmsglen < 8192)
                 config.c_maxmsglen = 8192;
 
@@ -89,6 +99,12 @@ void get_config(void) {
 
        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;
 }