X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.c;h=47504527158775e56f495cb239f39236a9e471b8;hb=673cad207cccf829038ab1a4399ca302bb0cf078;hp=efacd56e6bae6ed10ee773efdcd7922eb41adcda;hpb=772cee17b53bb6795a5e98f1ae2acb7e7d6c25c1;p=umurmur.git

diff --git a/src/conf.c b/src/conf.c
index efacd56..4750452 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -108,6 +108,17 @@ const char *getStrConf(param_t param)
 				return "/etc/umurmur/private_key.key";
 		}
 		break;
+	case CAPATH:
+		setting = config_lookup(&configuration, "ca_path");
+		if (!setting)
+		  return NULL;
+		else {
+			if ((strsetting = config_setting_get_string(setting)) != NULL)
+				return strsetting;
+			else
+				return NULL;
+		}
+		break;
 	case PASSPHRASE:
 		setting = config_lookup(&configuration, "password");
 		if (!setting)
@@ -333,6 +344,20 @@ int Conf_getNextChannel(conf_channel_t *chdesc, int index)
 		chdesc->noenter = false;
 	else
 		chdesc->noenter = config_setting_get_bool(setting);
+	
+	ret = snprintf(configstr, maxconfig, "channels.[%d].silent", index);
+	setting = config_lookup(&configuration, configstr);
+	if (ret >= maxconfig || ret < 0 || setting == NULL) /* Optional */
+		chdesc->silent = false;
+	else
+		chdesc->silent = config_setting_get_bool(setting);
+	
+	ret = snprintf(configstr, maxconfig, "channels.[%d].position", index);
+	setting = config_lookup(&configuration, configstr);
+	if (ret >= maxconfig || ret < 0 || setting == NULL) /* Optional */
+		chdesc->position = 0;
+	else
+		chdesc->position = config_setting_get_int(setting);
 
 	return 0;
 }