* Don't fail on "data files too old to be upgraded" for NEW installations

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index ca078b9d1b9c9e7626b1b88ffb4e7031751124cd..d16da648372c40782d04bd97e9daf464b513f1e3 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 609.1  2003/08/17 02:46:37  ajc
+ * Don't fail on "data files too old to be upgraded" for NEW installations
+
  Revision 609.0  2003/08/14 03:40:55  ajc
  * THIS IS 6.09
 
@@ -4961,3 +4964,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index 9e4c9324b1907d66a91e738f560cc95d05f910fa..5edbb91382a06b0549caca48e0573010a670cb4d 100644 (file)
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -187,14 +187,17 @@ void check_server_upgrades(void) {
 
        update_config();
 
-       if (CitControl.version < 555) {
+       if ((CitControl.version > 000) && (CitControl.version < 555)) {
                lprintf(1, "Your data files are from a version of Citadel\n"
                        "that is too old to be upgraded.  Sorry.\n");
                exit(EXIT_FAILURE);
        }
-
-       if (CitControl.version < 591) bump_mailbox_generation_numbers();
-       if (CitControl.version < 608) convert_bbsuid_to_minusone();
+       if ((CitControl.version > 000) && (CitControl.version < 591)) {
+               bump_mailbox_generation_numbers();
+       }
+       if ((CitControl.version > 000) && (CitControl.version < 608)) {
+               convert_bbsuid_to_minusone();
+       }
 
        CitControl.version = REV_LEVEL;
        put_control();