X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=9a8a4713b4f8aea5c548e1641328d1ab68368e8a;hb=4117d3174e8ae389db9fff2867592fc798a896b2;hp=6d72e6fd4e7e3d53ac86ab30760c45ffb7020d04;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git

diff --git a/onak-conf.c b/onak-conf.c
index 6d72e6f..9a8a471 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -1,7 +1,7 @@
 /*
  * onak-conf.c - Routines related to runtime config.
  *
- * Copyright 2002 Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2012 Jonathan McDowell <noodles@earth.li>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -28,7 +28,7 @@
 #include "log.h"
 #include "onak-conf.h"
 
-extern struct dbfuncs DBFUNCS;
+extern struct onak_dbctx *DBINIT(bool readonly);
 
 /*
  *	config - Runtime configuration for onak.
@@ -37,35 +37,38 @@ extern struct dbfuncs DBFUNCS;
  *	config file.
  */
 struct onak_config config = {
-	128,			/* maxkeys */
-	NULL,			/* thissite */
-	NULL,			/* adminemail */
-	NULL,			/* mta */
-	NULL,			/* syncsites */
-	NULL,			/* logfile */
+	.maxkeys = 128,
+	.thissite = NULL,
+	.adminemail = NULL,
+	.mta = NULL,
+	.syncsites = NULL,
+	.logfile = NULL,
 
-	false,			/* use_keyd */
+	.use_keyd = false,
+	.sock_dir = ".",
 
 	/*
 	 * Options for directory backends.
 	 */
-	NULL,			/* db_dir */
+	.db_dir = NULL,
 
 	/*
 	 * Options for the Postgres backend.
 	 */
-	NULL,			/* pg_dbhost */
-	NULL,			/* pg_dbname */
-	NULL,			/* pg_dbuser */
-	NULL,			/* pg_dbpass */
+	.pg_dbhost = NULL,
+	.pg_dbname = NULL,
+	.pg_dbuser = NULL,
+	.pg_dbpass = NULL,
 
 	/*
 	 * Options for dynamic backends.
 	 */
-	NULL,			/* db_backend */
-	NULL,			/* backends_dir */
+	.db_backend = NULL,
+	.backends_dir = NULL,
 
-	&DBFUNCS,		/* Default dbfuncs struct */
+	.dbinit = DBINIT,
+
+	.check_sighash = true,
 };
 
 bool parsebool(char *str, bool fallback)
@@ -90,15 +93,38 @@ void readconfig(const char *configfile) {
 	FILE *conffile;
 	char  curline[1024];
 	int   i;
+	char *dir, *conf;
+	size_t len;
 
 	curline[1023] = 0;
 	if (configfile == NULL) {
-		conffile = fopen(CONFIGFILE, "r");
+		conffile = NULL;
+		if ((dir = getenv("XDG_CONFIG_HOME")) != NULL) {
+			len = strlen(dir) + 1 + 9 + 1; /* dir + / + onak.conf + NUL */
+			conf = malloc(len);
+			snprintf(conf, len, "%s/onak.conf", dir);
+			conffile = fopen(conf, "r");
+			free(conf);
+		} else if ((dir = getenv("HOME")) != NULL) {
+			len = strlen(dir) + 18 + 1; /* dir + /.config/onak.conf + NUL */
+			conf = malloc(len);
+			snprintf(conf, len, "%s/.config/onak.conf", dir);
+			conffile = fopen(conf, "r");
+			free(conf);
+		}
+		if (conffile == NULL) {
+			conffile = fopen(CONFIGFILE, "r");
+		}
 	} else {
 		conffile = fopen(configfile, "r");
 	}
 	if (conffile != NULL) {
-		fgets(curline, 1023, conffile);
+		if (!fgets(curline, 1023, conffile)) {
+			logthing(LOGTHING_CRITICAL,
+				"Problem reading configuration file.");
+			fclose(conffile);
+			return;
+		}
 
 		while (!feof(conffile)) {
 			for (i = strlen(curline) - 1;
@@ -175,12 +201,22 @@ void readconfig(const char *configfile) {
 		} else if (!strncmp("use_keyd ", curline, 9)) {
 			config.use_keyd = parsebool(&curline[9],
 						config.use_keyd);
+		} else if (!strncmp("sock_dir ", curline, 9)) {
+			config.sock_dir = strdup(&curline[9]);
+		} else if (!strncmp("check_sighash ", curline, 9)) {
+			config.check_sighash = parsebool(&curline[9],
+						config.check_sighash);
 		} else {
 			logthing(LOGTHING_ERROR,
 				"Unknown config line: %s", curline);
 		}
 
-			fgets(curline, 1023, conffile);
+			if (!fgets(curline, 1023, conffile) &&
+					!feof(conffile)) {
+				logthing(LOGTHING_CRITICAL,
+					"Problem reading configuration file.");
+				break;
+			}
 		}
 		fclose(conffile);
 	} else {