Fix warnings all over citserver; handle function replies; remove unused code.

[citadel.git] / citadel / config.c

diff --git a/citadel/config.c b/citadel/config.c
index 948f030052f7e2d7ddba5512b9850889fc46019a..bc9a4128e9bd0b9c8cc5c0793797cee82d5a8bf1 100644 (file)
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,9 +1,21 @@
 /*
- * $Id$
+ * Read and write the citadel.config file
  *
- * This function reads the citadel.config file.  It should be called at
- * the beginning of EVERY Citadel program.
+ * Copyright (c) 1987-2009 by the citadel.org team
  *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -19,6 +31,10 @@
 #include "server.h"
 #include "config.h"
 
+
+#include "ctdl_module.h"
+
+
 struct config config;
 
 /*
@@ -29,6 +45,7 @@ struct config config;
 void get_config(void) {
        FILE *cfp;
        struct stat st;
+       int rv;
 
        if (chdir(ctdl_bbsbase_dir) != 0) {
                fprintf(stderr,
@@ -48,7 +65,14 @@ void get_config(void) {
                                strerror(errno));
                exit(CTDLEXIT_CONFIG);
        }
-       fread((char *) &config, sizeof(struct config), 1, cfp);
+       memset(&config, 0, sizeof(struct config));
+       rv = fread((char *) &config, sizeof(struct config), 1, cfp);
+       if (rv != 1)
+       {
+               fprintf(stderr, 
+                       "Warning: The config file %s has unexpected size. \n",
+                       file_citadel_config);
+       }
        if (fstat(fileno(cfp), &st)) {
                perror(file_citadel_config);
                exit(CTDLEXIT_CONFIG);
@@ -81,7 +105,7 @@ void get_config(void) {
 
        /* Only allow LDAP auth mode if we actually have LDAP support */
 #ifndef HAVE_LDAP
-       if (config.c_auth_mode == AUTHMODE_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);
@@ -149,11 +173,15 @@ void get_config(void) {
 void put_config(void)
 {
        FILE *cfp;
+       int rv;
 
        if ((cfp = fopen(file_citadel_config, "rb+")) == NULL)
                perror(file_citadel_config);
        else {
-               fwrite((char *) &config, sizeof(struct config), 1, cfp);
+               rv = fwrite((char *) &config, sizeof(struct config), 1, cfp);
+               if (rv == -1)
+                       syslog(LOG_EMERG, "Failed to write: %s [%s]\n", 
+                              file_citadel_config, strerror(errno));
                fclose(cfp);
        }
 }