From 3f46a685f0270d217dd4740ca067c054fd470b7a Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Mon, 25 Jan 2021 14:34:55 +1000
Subject: [PATCH] * add deprecation warning for some jail opts

---
 src/jail.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/jail.c b/src/jail.c
index 64710b6..2efcc8d 100644
--- a/src/jail.c
+++ b/src/jail.c
@@ -31,6 +31,15 @@ static f2b_jail_t defaults = {
   .maxretry   = DEFAULT_MAXRETRY,
 };
 
+static struct opt_remap {
+  const char *old;
+  const char *new;
+} deprecated[] = {
+  { .old = "incr_bantime",   .new = "bantime_extend"  },
+  { .old = "incr_findtime",  .new = "findtime_extend" },
+  { .old = NULL } /* end of list */
+};
+
 void
 f2b_jail_parse_compound_value(const char *value, char *name, char *init) {
   size_t len = 0;
@@ -108,6 +117,16 @@ f2b_jail_set_param(f2b_jail_t *jail, const char *param, const char *value) {
     jail->findtime_extend = atof(value);
     return true;
   }
+  if (strcmp(param, "expiretime_extend") == 0) {
+    jail->expiretime_extend = atof(value);
+    return true;
+  }
+  for (struct opt_remap *opt = deprecated; opt->old != NULL; opt++) {
+    if (strcmp(opt->old, param) != 0)
+      continue;
+    f2b_log_msg(log_warn, "jail '%s': param '%s' deprecated, use '%s' instead", jail->name, opt->old, opt->new);
+    return true;
+  }
   return false;
 }