* Makefile.in, configure.in, chkpwd.c, acconfig.h: support for

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 4e2e5a271f8915fbe4113dba2770678978466f04..e738ff57dcebec0802b9b3c8d3da3edfdf396f7a 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -7,6 +7,7 @@
 
 #include "sysdep.h"
 #include <stdlib.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
@@ -21,12 +22,13 @@ int home_specified = 0;
 
 void get_config(void) {
        FILE *cfp;
+       struct stat st;
 
        if (chdir( home_specified ? bbs_home_directory : BBSDIR ) != 0) {
                fprintf(stderr, "Cannot start.\nThere is no Citadel installation in %s\n%s\n",
                        (home_specified ? bbs_home_directory : BBSDIR),
                        strerror(errno));
-               exit(errno);
+               exit(1);
                }
        cfp=fopen("citadel.config","rb");
        if (cfp==NULL) {
@@ -34,9 +36,18 @@ void get_config(void) {
                fprintf(stderr, "There is no citadel.config in %s\n%s\n",
                        (home_specified ? bbs_home_directory : BBSDIR),
                        strerror(errno));
-               exit(errno);
+               exit(1);
                }
        fread((char *)&config,sizeof(struct config),1,cfp);
+       if (fstat(fileno(cfp), &st)) {
+               perror("citadel.config");
+               exit(1);
+               }
+       if (st.st_uid != BBSUID || st.st_mode != (S_IFREG | S_IRUSR | S_IWUSR))
+               {
+               fprintf(stderr, "check the permissions on citadel.config\n");
+               exit(1);
+               }
        fclose(cfp);
        if ( (config.c_setup_level / 10) != (REV_LEVEL/10) ) {
                fprintf(stderr, "config: Your data files are out of date.  ");