Oops, managed to commit a partial change regarding the POP3 client

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index b466c3acae182f4f7660bdf2320a946389cd9640..830627043ded7b399fe8e6a87331cd2ca0ada482 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -14,9 +14,9 @@
 #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"
 
 struct config config;
@@ -53,9 +53,11 @@ 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=%ld but %ld 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) ;
@@ -65,16 +67,25 @@ void get_config(void) {
                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);
+       }
+
+
+       /* 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 +116,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;
+       }
 }