Prepared some of the authmode stuff for the imminent addition

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index b4c38b569f2e1ee114b46cdfe00d08308d18fe0a..48e04420cb160bdc6975f0544011eff2eb149bfd 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -16,7 +16,6 @@
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include "serv_extensions.h"
 #include "config.h"
 
 struct config config;
@@ -30,12 +29,12 @@ void get_config(void) {
        FILE *cfp;
        struct stat st;
 
-       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);
        }
@@ -55,13 +54,14 @@ void get_config(void) {
        }
 #ifndef __CYGWIN__
        if (st.st_uid != CTDLUID) {
-               fprintf(stderr, "%s must be owned by uid=%d\n", file_citadel_config, CTDLUID);
+               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\n",
-                       file_citadel_config, 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);
                exit(CTDLEXIT_CONFIG);
        }
 #endif
@@ -105,6 +105,11 @@ void get_config(void) {
                config.c_net_freq = 3600L;      /* once per hour default */
        if (config.c_net_freq < 300L) 
                config.c_net_freq = 300L;
+
+       /* "create new user" only works with native authentication mode */
+       if (config.c_auth_mode != AUTHMODE_NATIVE) {
+               config.c_disable_newu = 1;
+       }
 }