X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=81d7bdf97cc978ff2f271643a8dccb61ebf710ad;hb=a047e3e158d560af079bec920460711d8222317c;hp=126bd565d4409515bf2f084333e8f27244791283;hpb=42bcfe2cae29f375af4cf2cd3ccfa196b77a3946;p=onak.git

diff --git a/onak-conf.c b/onak-conf.c
index 126bd56..81d7bdf 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -6,12 +6,15 @@
  * Copyright 2002 Project Purple
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "ll.h"
+#include "log.h"
 #include "onak-conf.h"
 
 /*
@@ -26,28 +29,33 @@ struct onak_config config = {
 	NULL,			/* adminemail */
 	NULL,			/* mta */
 	NULL,			/* syncsites */
+	NULL,			/* logfile */
 
 	/*
 	 * Options for directory backends.
 	 */
-	"/home/noodles/onak-db",	/* db_dir */
+	NULL,			/* db_dir */
 
 	/*
 	 * Options for the Postgres backend.
 	 */
 	NULL,			/* pg_dbhost */
-	"noodles",		/* pg_dbname */
+	NULL,			/* pg_dbname */
 	NULL,			/* pg_dbuser */
 	NULL,			/* pg_dbpass */
 };
 
-void readconfig(void) {
+void readconfig(const char *configfile) {
 	FILE *conffile;
 	char  curline[1024];
 	int   i;
 
 	curline[1023] = 0;
-	conffile = fopen(CONFIGFILE, "r");
+	if (configfile == NULL) {
+		conffile = fopen(CONFIGFILE, "r");
+	} else {
+		conffile = fopen(configfile, "r");
+	}
 	if (conffile != NULL) {
 		fgets(curline, 1023, conffile);
 
@@ -104,6 +112,10 @@ void readconfig(void) {
 		} else if (!strncmp("syncsite ", curline, 9)) {
 			config.syncsites =
 				lladd(config.syncsites, strdup(&curline[9]));
+		} else if (!strncmp("logfile ", curline, 8)) {
+			config.logfile = strdup(&curline[8]);
+		} else if (!strncmp("loglevel ", curline, 9)) {
+			setlogthreshold(atoi(&curline[9]));
 		} else if (!strncmp("this_site ", curline, 10)) {
 			config.thissite = strdup(&curline[10]);
 		} else if (!strncmp("socket_name ", curline, 12) ||
@@ -114,13 +126,58 @@ void readconfig(void) {
 			 * Not applicable; ignored for compatibility with pksd.
 			 */
 		} else {
-			fprintf(stderr, "Unknown config line: %s\n", curline);
+			logthing(LOGTHING_ERROR,
+				"Unknown config line: %s", curline);
 		}
 
 			fgets(curline, 1023, conffile);
 		}
 		fclose(conffile);
 	} else {
-		fprintf(stderr, "Couldn't open config file; using defaults.\n");
+		logthing(LOGTHING_NOTICE,
+				"Couldn't open config file; using defaults.");
+	}
+}
+
+void cleanupconfig(void) {
+	if (config.thissite != NULL) {
+		free(config.thissite);
+		config.thissite = NULL;
+	}
+	if (config.adminemail != NULL) {
+		free(config.adminemail);
+		config.adminemail = NULL;
+	}
+	if (config.mta != NULL) {
+		free(config.mta);
+		config.mta = NULL;
+	}
+	if (config.db_dir != NULL) {
+		free(config.db_dir);
+		config.db_dir = NULL;
+	}
+	if (config.pg_dbhost != NULL) {
+		free(config.pg_dbhost);
+		config.pg_dbhost = NULL;
+	}
+	if (config.pg_dbname != NULL) {
+		free(config.pg_dbname);
+		config.pg_dbname = NULL;
+	}
+	if (config.pg_dbuser != NULL) {
+		free(config.pg_dbuser);
+		config.pg_dbuser = NULL;
+	}
+	if (config.pg_dbpass != NULL) {
+		free(config.pg_dbpass);
+		config.pg_dbpass = NULL;
+	}
+	if (config.syncsites != NULL) {
+		llfree(config.syncsites, free);
+		config.syncsites = NULL;
+	}
+	if (config.logfile != NULL) {
+		free(config.logfile);
+		config.logfile = NULL;
 	}
 }