X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=dad9eaee1437075d76e8f1a5e84b2fdf98f24fc1;hb=4eb74b26380dfde31c86c685f0589e0c653aebf0;hp=a8d4ca6b7f45b7c100f54ef57faccdb5e3aacbe1;hpb=01cc19a4c2da27b4db0e980ccd3ca54d834319c8;p=citadel.git

diff --git a/citadel/config.c b/citadel/config.c
index a8d4ca6b7..dad9eaee1 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,9 +1,23 @@
 /*
  * $Id$
  *
- * This function reads the citadel.config file.  It should be called at
- * the beginning of EVERY Citadel program.
+ * Read and write the citadel.config file
  *
+ * Copyright (c) 1987-2009 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 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
  */
 
 #include "sysdep.h"
@@ -14,6 +28,7 @@
 #include <errno.h>
 #include <string.h>
 #include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "config.h"
@@ -52,6 +67,7 @@ void get_config(void) {
 		perror(file_citadel_config);
 		exit(CTDLEXIT_CONFIG);
 	}
+
 #ifndef __CYGWIN__
 	if (st.st_uid != CTDLUID) {
 		fprintf(stderr, "%s must be owned by uid="F_UID_T" but "F_UID_T" owns it!\n", 
@@ -61,20 +77,37 @@ void get_config(void) {
 	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);
@@ -106,9 +139,20 @@ void get_config(void) {
 	if (config.c_net_freq < 300L) 
 		config.c_net_freq = 300L;
 
-	/* "create new user" never works with host auth */
-	if (config.c_auth_mode == 1)
+	/* 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;
+	}
 }