X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=303e06d4bd7346311a4e40520911e740bcc9ec75;hb=3eaca09e0fa7dd68275da9ac948e03e52715baa8;hp=22073dd7b439443bc362928c73526bdec79d2a5e;hpb=5f89362ae2889304de960b05d1672363e0d733d8;p=citadel.git

diff --git a/citadel/config.c b/citadel/config.c
index 22073dd7b..303e06d4b 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"
@@ -14,11 +20,15 @@
 #include <errno.h>
 #include <string.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
-#include "serv_extensions.h"
 #include "config.h"
 
+
+#include "ctdl_module.h"
+
+
 struct config config;
 
 /*
@@ -29,13 +39,14 @@ struct config config;
 void get_config(void) {
 	FILE *cfp;
 	struct stat st;
+	int rv;
 
-	if (chdir(home_specified ? ctdl_home_directory : CTDLDIR) != 0) {
+	if (chdir(ctdl_bbsbase_dir) != 0) {
 		fprintf(stderr,
 			"This program could not be started.\n"
 		 	"Unable to change directory to %s\n"
 			"Error: %s\n",
-			(home_specified ? ctdl_home_directory : CTDLDIR),
+			ctdl_bbsbase_dir,
 			strerror(errno));
 		exit(CTDLEXIT_HOME);
 	}
@@ -48,33 +59,59 @@ 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);
 	}
+
 #ifndef __CYGWIN__
 	if (st.st_uid != CTDLUID) {
-		fprintf(stderr, "%s must be owned by uid=%d but %d owns it!\n", file_citadel_config, CTDLUID, st.st_uid);
+		fprintf(stderr, "%s must be owned by uid="F_UID_T" but "F_UID_T" owns it!\n", 
+			file_citadel_config, CTDLUID, st.st_uid);
 		exit(CTDLEXIT_CONFIG);
 	}
 	int desired_mode = (S_IFREG | S_IRUSR | S_IWUSR) ;
 	if (st.st_mode != desired_mode) {
 		fprintf(stderr, "%s must be set to permissions mode %03o but they are %03o\n",
-			file_citadel_config, desired_mode, st.st_mode);
+			file_citadel_config, (desired_mode & 0xFFF), (st.st_mode & 0xFFF));
 		exit(CTDLEXIT_CONFIG);
 	}
 #endif
+
 	fclose(cfp);
 
+	/* Ensure that we are linked to the correct version of libcitadel */
+	if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
+		fprintf(stderr, "    You are running libcitadel version %d.%02d\n",
+			(libcitadel_version_number() / 100), (libcitadel_version_number() % 100));
+		fprintf(stderr, "citserver was compiled against version %d.%02d\n",
+			(LIBCITADEL_VERSION_NUMBER / 100), (LIBCITADEL_VERSION_NUMBER % 100));
+		exit(CTDLEXIT_LIBCITADEL);
+	}
+
+	/* Only allow LDAP auth mode if we actually have LDAP support */
+#ifndef HAVE_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, "config: Your data files are out of date.  ");
-		fprintf(stderr, "Run setup to update them.\n");
-		fprintf(stderr,
-			"        This program requires level %d.%02d\n",
+		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",
+		fprintf(stderr, "        Data files are currently at %d.%02d\n",
 			(config.c_setup_level / 100),
 			(config.c_setup_level % 100));
 		exit(CTDLEXIT_OOD);
@@ -105,6 +142,21 @@ void get_config(void) {
 		config.c_net_freq = 3600L;	/* once per hour default */
 	if (config.c_net_freq < 300L) 
 		config.c_net_freq = 300L;
+
+	/* Same goes for POP3 */
+	if (config.c_pop3_fetch == 0L)
+		config.c_pop3_fetch = 3600L;	/* once per hour default */
+	if (config.c_pop3_fetch < 300L) 
+		config.c_pop3_fetch = 300L;
+	if (config.c_pop3_fastest == 0L)
+		config.c_pop3_fastest = 3600L;	/* once per hour default */
+	if (config.c_pop3_fastest < 300L) 
+		config.c_pop3_fastest = 300L;
+
+	/* "create new user" only works with native authentication mode */
+	if (config.c_auth_mode != AUTHMODE_NATIVE) {
+		config.c_disable_newu = 1;
+	}
 }
 
 
@@ -115,11 +167,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);
 	}
 }