* solaris compatibility patches.

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 747134506c931ab84798027c622fa211b0ab6ecd..b466c3acae182f4f7660bdf2320a946389cd9640 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -30,14 +30,14 @@ 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(1);
+               exit(CTDLEXIT_HOME);
        }
        cfp = fopen(file_citadel_config, "rb");
        if (cfp == NULL) {
@@ -46,18 +46,23 @@ void get_config(void) {
                                "Error: %s\n",
                                file_citadel_config,
                                strerror(errno));
-               exit(1);
+               exit(CTDLEXIT_CONFIG);
        }
        fread((char *) &config, sizeof(struct config), 1, cfp);
        if (fstat(fileno(cfp), &st)) {
                perror(file_citadel_config);
-               exit(1);
+               exit(CTDLEXIT_CONFIG);
        }
 #ifndef __CYGWIN__
-       if (st.st_uid != CTDLUID || st.st_mode != (S_IFREG | S_IRUSR | S_IWUSR)) {
-               fprintf(stderr, "check the permissions on %s\n", file_citadel_config);
-               //              fprintf(stderr, "check the permissions on citadel.config\n");
-               exit(1);
+       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);
+               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);
+               exit(CTDLEXIT_CONFIG);
        }
 #endif
        fclose(cfp);
@@ -72,7 +77,7 @@ void get_config(void) {
                        "        Data files are currently at %d.%02d\n",
                        (config.c_setup_level / 100),
                        (config.c_setup_level % 100));
-               exit(1);
+               exit(CTDLEXIT_OOD);
        }
 
         /* Default maximum message length is 10 megabytes.  This is site