X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=a29a58bfc7979df54957028a24cbc5b8734c72e9;hb=8d910718e5f13444b2948396564a809b2307f0cf;hp=5f07e02426e25b22594e6eb2f7da74263fe6dc31;hpb=7f88fa1553a361d5d70a87eeeb7a37e1f3476cc8;p=onak.git

diff --git a/onak-conf.c b/onak-conf.c
index 5f07e02..a29a58b 100644
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -1,9 +1,20 @@
 /*
  * onak-conf.c - Routines related to runtime config.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2012 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * 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
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
@@ -55,6 +66,8 @@ struct onak_config config = {
 	NULL,			/* backends_dir */
 
 	&DBFUNCS,		/* Default dbfuncs struct */
+
+	true,			/* Check packet sig hashes */
 };
 
 bool parsebool(char *str, bool fallback)
@@ -79,10 +92,28 @@ 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");
 	}
@@ -164,6 +195,9 @@ void readconfig(const char *configfile) {
 		} else if (!strncmp("use_keyd ", curline, 9)) {
 			config.use_keyd = parsebool(&curline[9],
 						config.use_keyd);
+		} 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);