More sane behavior on a new installation

[citadel.git] / citadel / modules / upgrade / serv_upgrade.c

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 8e7ef34553a73014799218c4d0dff59adad75140..ebd48a213590f329fa7a85efa2fd77dee92caca0 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -48,12 +48,9 @@
 #include "msgbase.h"
 #include "serv_upgrade.h"
 #include "euidindex.h"
-
-
 #include "ctdl_module.h"
 
 
-
 /*
  * Fix up the name for Citadel user 0 and try to remove any extra users with number 0
  */
@@ -265,10 +262,6 @@ void guess_time_zone(void) {
 void update_config(void) {
        get_config();
 
-       if (CitControl.version == 0) {
-               config.c_instant_expunge = 1;
-       }
-
        if (CitControl.version < 606) {
                config.c_rfc822_strict_from = 0;
        }
@@ -353,6 +346,23 @@ void check_server_upgrades(void) {
                remove_thread_users();
        }
        CitControl.version = REV_LEVEL;
+
+       /*
+        * Negative values for maxsessions are not allowed.
+        */
+       if (config.c_maxsessions < 0) {
+               config.c_maxsessions = 0;
+       }
+
+       /* We need a system default message expiry policy, because this is
+        * the top level and there's no 'higher' policy to fall back on.
+        * By default, do not expire messages at all.
+        */
+       if (config.c_ep.expire_mode == 0) {
+               config.c_ep.expire_mode = EXPIRE_MANUAL;
+               config.c_ep.expire_value = 0;
+       }
+
        put_control();
 }