X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/34b03028378025ad22c8d29f70e81109cee690c2..348e7d134e9243fd72cf8fbe366c77c1571faec1:/onak-conf.c?ds=inline

diff --git a/onak-conf.c b/onak-conf.c
index 93a9320..70990f8 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -6,14 +6,19 @@
  * 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"
 
+extern struct dbfuncs DBFUNCS;
+
 /*
  *	config - Runtime configuration for onak.
  *
@@ -26,6 +31,7 @@ struct onak_config config = {
 	NULL,			/* adminemail */
 	NULL,			/* mta */
 	NULL,			/* syncsites */
+	NULL,			/* logfile */
 
 	/*
 	 * Options for directory backends.
@@ -39,22 +45,36 @@ struct onak_config config = {
 	NULL,			/* pg_dbname */
 	NULL,			/* pg_dbuser */
 	NULL,			/* pg_dbpass */
+
+	/*
+	 * Options for dynamic backends.
+	 */
+	NULL,			/* db_backend */
+	NULL,			/* backends_dir */
+
+	&DBFUNCS,		/* Default dbfuncs struct */
 };
 
-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);
 
 		while (!feof(conffile)) {
-		for (i = strlen(curline) - 1; isspace(curline[i]); i--) {
-			curline[i] = 0;
-		}
+			for (i = strlen(curline) - 1;
+					i >= 0 && isspace(curline[i]);
+					i--) {
+				curline[i] = 0;
+			}
 
 		if (curline[0] == '#' || curline[0] == 0) {
 			/*
@@ -104,6 +124,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) ||
@@ -113,15 +137,21 @@ void readconfig(void) {
 			/*
 			 * Not applicable; ignored for compatibility with pksd.
 			 */
+		} else if (!strncmp("db_backend ", curline, 11)) {
+			config.db_backend = strdup(&curline[11]);
+		} else if (!strncmp("backends_dir ", curline, 13)) {
+			config.backends_dir = strdup(&curline[13]);
 		} 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.");
 	}
 }
 
@@ -162,4 +192,16 @@ void cleanupconfig(void) {
 		llfree(config.syncsites, free);
 		config.syncsites = NULL;
 	}
+	if (config.logfile != NULL) {
+		free(config.logfile);
+		config.logfile = NULL;
+	}
+	if (config.db_backend != NULL) {
+		free(config.db_backend);
+		config.db_backend = NULL;
+	}
+	if (config.backends_dir != NULL) {
+		free(config.backends_dir);
+		config.backends_dir = NULL;
+	}
 }