X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=bc9a4128e9bd0b9c8cc5c0793797cee82d5a8bf1;hb=e26a8dee20d1726b4995821f717f867f50fc5659;hp=fb9df692df1f2443df30043fa774ec53bee70b23;hpb=38b3aec67e67dfaff67670494e6e570bff2246aa;p=citadel.git

diff --git a/citadel/config.c b/citadel/config.c
index fb9df692d..bc9a4128e 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Read and write the citadel.config file
  *
  * Copyright (c) 1987-2009 by the citadel.org team
@@ -47,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,
@@ -66,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);
@@ -167,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);
 	}
 }