Completed the overhaul of setup.

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 6817e27fe860c19621028152f5c7281ea5d08d5e..60806b1b7724e4179a6ae4aba52d51a5f4b9a3a7 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,21 +1,15 @@
 /*
  * Read and write the citadel.config file
  *
- * Copyright (c) 1987-2009 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -112,17 +106,6 @@ void get_config(void) {
        }
 #endif
 
-       /* Check to see whether 'setup' must first be run to update data file formats */
-       if (config.c_setup_level < REV_MIN) {
-               fprintf(stderr, "Your data files are out of date.  Run setup to update them.\n");
-               fprintf(stderr, "        This program requires level %d.%02d\n",
-                       (REV_LEVEL / 100), (REV_LEVEL % 100));
-               fprintf(stderr, "        Data files are currently at %d.%02d\n",
-                       (config.c_setup_level / 100),
-                       (config.c_setup_level % 100));
-               exit(CTDLEXIT_OOD);
-       }
-
         /* 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.
@@ -179,6 +162,9 @@ void put_config(void)
                perror(file_citadel_config);
        else {
                rv = fwrite((char *) &config, sizeof(struct config), 1, cfp);
+               if (rv == -1)
+                       syslog(LOG_EMERG, "Failed to write: %s [%s]\n", 
+                              file_citadel_config, strerror(errno));
                fclose(cfp);
        }
 }