* Added a separate authentication mode AUTHMODE_LDAP_AD for Active Directory's nonsta...

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index cc1e01091fd86a81ff836e8840f6afb1884c3156..c6565b35d1696538e80ab5a848a6a547784b4889 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,8 +1,7 @@
 /*
  * $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
  *
  */
 
@@ -63,7 +62,7 @@ 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
@@ -79,6 +78,14 @@ void get_config(void) {
                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) {
@@ -117,6 +124,16 @@ void get_config(void) {
        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;