From 6af55f1bad3a14c677c84c45547f7e77ceb8e7b7 Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Tue, 8 Mar 2016 14:39:40 +1000
Subject: [PATCH] * jail.[ch]: chg jail definition & update
 f2b_jail_apply_config()

---
 src/jail.c | 22 ++++++++++++++++------
 src/jail.h |  6 ++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/jail.c b/src/jail.c
index 13c79eb..3e03663 100644
--- a/src/jail.c
+++ b/src/jail.c
@@ -35,15 +35,14 @@ f2b_jail_parse_compound_value(const char *value, char *name, char *init) {
 }
 
 void
-f2b_jail_apply_config(f2b_jail_t *jail, f2b_config_section_t *config) {
+f2b_jail_apply_config(f2b_jail_t *jail, f2b_config_section_t *section) {
   f2b_config_param_t *param = NULL;
 
   assert(jail != NULL);
-  assert(config != NULL);
-  assert(config->type != t_jail);
+  assert(section != NULL);
+  assert(section->type != t_jail || section->type == t_defaults);
 
-  param = config->param;
-  for (; param != NULL; param = param->next) {
+  for (param = section->param; param != NULL; param = param->next) {
     if (strcmp(param->name, "enabled") == 0) {
       if (strcmp(param->value, "yes") == 0)
         jail->enabled = true;
@@ -61,7 +60,18 @@ f2b_jail_apply_config(f2b_jail_t *jail, f2b_config_section_t *config) {
         jail->tries = DEFAULT_TRIES;
       continue;
     }
-    f2b_log_msg(log_warn, "unrecognized param in section [defaults]: %s", param->name);
+    if (strcmp(param->name, "source") == 0) {
+      f2b_jail_parse_compound_value(param->value, jail->source_name, jail->source_init);
+      continue;
+    }
+    if (strcmp(param->name, "filter") == 0) {
+      f2b_jail_parse_compound_value(param->value, jail->filter_name, jail->filter_init);
+      continue;
+    }
+    if (strcmp(param->name, "backend") == 0) {
+      f2b_jail_parse_compound_value(param->value, jail->backend_name, jail->backend_init);
+      continue;
+    }
   }
 
   return;
diff --git a/src/jail.h b/src/jail.h
index fb9c135..ccfcf46 100644
--- a/src/jail.h
+++ b/src/jail.h
@@ -14,6 +14,12 @@ typedef struct f2b_jail_t {
   size_t tries;
   char name[CONFIG_KEY_MAX];
   char glob[PATH_MAX];
+  char backend_name[CONFIG_KEY_MAX];
+  char backend_init[CONFIG_VAL_MAX];
+  char filter_name[CONFIG_KEY_MAX];
+  char filter_init[CONFIG_VAL_MAX];
+  char source_name[CONFIG_KEY_MAX];
+  char source_init[CONFIG_VAL_MAX];
   f2b_logfile_t *logfiles;
   f2b_regex_t   *regexps;
   f2b_ipaddr_t  *ipaddrs;