X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/7f046503b8b8dcec51c1f7752e87ba0ba0af0631..fb43c9ffd09b3f5e8fd35651daed59839221fe36:/onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index 1ed252c..0958502 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -4,10 +4,10 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: onak-conf.c,v 1.8 2003/10/15 21:15:21 noodles Exp $
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,6 +43,12 @@ struct onak_config config = {
 	NULL,			/* pg_dbname */
 	NULL,			/* pg_dbuser */
 	NULL,			/* pg_dbpass */
+
+	/*
+	 * Options for dynamic backends.
+	 */
+	NULL,			/* db_backend */
+	NULL,			/* backends_dir */
 };
 
 void readconfig(const char *configfile) {
@@ -60,9 +66,11 @@ void readconfig(const char *configfile) {
 		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) {
 			/*
@@ -114,6 +122,8 @@ void readconfig(const char *configfile) {
 				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) ||
@@ -123,6 +133,10 @@ void readconfig(const char *configfile) {
 			/*
 			 * 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);
@@ -178,4 +192,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;
+	}
 }