From 615ac0827db3a53bc34e496ff921cc5bc559bcea Mon Sep 17 00:00:00 2001
From: Martin Johansson <martin@fatbob.nu>
Date: Fri, 24 Feb 2012 11:50:57 +0100
Subject: [PATCH] Added configuration params for admin and ban.

---
 src/conf.c | 20 ++++++++++++++++++++
 src/conf.h |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/src/conf.c b/src/conf.c
index 2a83e53..adc0e1b 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -44,6 +44,7 @@ static config_t configuration;
 #define DEFAULT_MAX_CLIENTS 10
 #define DEFAULT_MAX_BANDWIDTH 48000
 #define DEFAULT_BINDPORT 64738
+#define DEFAULT_BAN_LENGTH (60*60)
 
 const char defaultconfig[] = DEFAULT_CONFIG;
 
@@ -117,6 +118,17 @@ const char *getStrConf(param_t param)
 				return "";
 		}
 		break;
+	case ADMIN_PASSPHRASE:
+		setting = config_lookup(&configuration, "admin_password");
+		if (!setting)
+			return "";
+		else {
+			if ((strsetting = config_setting_get_string(setting)) != NULL)
+				return strsetting;
+			else
+				return "";
+		}
+		break;
 	case BINDADDR:
 		setting = config_lookup(&configuration, "bindaddr");
 		if (!setting)
@@ -203,6 +215,14 @@ int getIntConf(param_t param)
 			return config_setting_get_int(setting);
 		}
 		break;
+	case BAN_LENGTH:
+		setting = config_lookup(&configuration, "ban_length");
+		if (!setting)
+			return DEFAULT_BAN_LENGTH;
+		else {
+			return config_setting_get_int(setting);
+		}
+		break;
 	case MAX_BANDWIDTH:
 		setting = config_lookup(&configuration, "max_bandwidth");
 		if (!setting)
diff --git a/src/conf.h b/src/conf.h
index 20141dc..100c73f 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -48,6 +48,8 @@ typedef enum param {
 	USERNAME,
 	GROUPNAME,
 	LOGFILE,
+	ADMIN_PASSPHRASE,
+	BAN_LENGTH,
 } param_t;
 
 typedef struct {
-- 
2.30.2