* config.c: default setting for "maxmsglen" is now 10 megabytes, not INT_MAX

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 4f7de769e193ba192a663a85b49e396a23d5a556..ed95eab0a5b3b81648a89674bdc10281f6c833ce 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -6,6 +6,10 @@
  *
  */
 
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <sys/stat.h>
@@ -15,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;
@@ -53,10 +59,12 @@ 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_MIN) {
@@ -72,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;
 
@@ -90,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;
 }