X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=60806b1b7724e4179a6ae4aba52d51a5f4b9a3a7;hb=f927644354ef6b22db16a66d043ef42a056b82ee;hp=948f030052f7e2d7ddba5512b9850889fc46019a;hpb=f2c07f3fa5c0904b970b6cc45416831f638a733f;p=citadel.git

diff --git a/citadel/config.c b/citadel/config.c
index 948f03005..60806b1b7 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,9 +1,15 @@
 /*
- * $Id$
+ * Read and write the citadel.config file
  *
- * This function reads the citadel.config file.  It should be called at
- * the beginning of EVERY Citadel program.
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
+ * 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.
  */
 
 #include "sysdep.h"
@@ -19,6 +25,10 @@
 #include "server.h"
 #include "config.h"
 
+
+#include "ctdl_module.h"
+
+
 struct config config;
 
 /*
@@ -29,6 +39,7 @@ struct config config;
 void get_config(void) {
 	FILE *cfp;
 	struct stat st;
+	int rv;
 
 	if (chdir(ctdl_bbsbase_dir) != 0) {
 		fprintf(stderr,
@@ -48,7 +59,14 @@ void get_config(void) {
 				strerror(errno));
 		exit(CTDLEXIT_CONFIG);
 	}
-	fread((char *) &config, sizeof(struct config), 1, cfp);
+	memset(&config, 0, sizeof(struct config));
+	rv = fread((char *) &config, sizeof(struct config), 1, cfp);
+	if (rv != 1)
+	{
+		fprintf(stderr, 
+			"Warning: The config file %s has unexpected size. \n",
+			file_citadel_config);
+	}
 	if (fstat(fileno(cfp), &st)) {
 		perror(file_citadel_config);
 		exit(CTDLEXIT_CONFIG);
@@ -81,24 +99,13 @@ void get_config(void) {
 
 	/* Only allow LDAP auth mode if we actually have LDAP support */
 #ifndef HAVE_LDAP
-	if (config.c_auth_mode == AUTHMODE_LDAP) {
+	if ((config.c_auth_mode == AUTHMODE_LDAP) || (config.c_auth_mode == AUTHMODE_LDAP_AD)) {
 		fprintf(stderr, "Your system is configured for LDAP authentication,\n"
 				"but you are running a server built without OpenLDAP support.\n");
 		exit(CTDL_EXIT_UNSUP_AUTH);
 	}
 #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.
@@ -149,11 +156,15 @@ void get_config(void) {
 void put_config(void)
 {
 	FILE *cfp;
+	int rv;
 
 	if ((cfp = fopen(file_citadel_config, "rb+")) == NULL)
 		perror(file_citadel_config);
 	else {
-		fwrite((char *) &config, sizeof(struct config), 1, cfp);
+		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);
 	}
 }