X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/3b5b9db0bc2dbe93b3b79e722997606c71ecafb9..a534b3b856a1e3cbfe60bc0bca432e802f9718be:/onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index f215b31..70990f8 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -6,6 +6,8 @@
  * Copyright 2002 Project Purple
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -15,6 +17,8 @@
 #include "log.h"
 #include "onak-conf.h"
 
+extern struct dbfuncs DBFUNCS;
+
 /*
  *	config - Runtime configuration for onak.
  *
@@ -41,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) {
 			/*
@@ -108,6 +126,8 @@ void readconfig(void) {
 				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) ||
@@ -117,6 +137,10 @@ 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 {
 			logthing(LOGTHING_ERROR,
 				"Unknown config line: %s", curline);
@@ -172,4 +196,12 @@ void cleanupconfig(void) {
 		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;
+	}
 }