From 2490ea9fbced249b72d7d927f8d3a494a6b970d8 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Fri, 6 Nov 2020 13:05:00 +0100 Subject: [PATCH] TT#99150 permissions: fix missing reload_delta export parameter * fix 41cb540c1304bfa11a8675fcb26a178301b2820b Change-Id: Ibceecb8e0a3cac297773765afc0862b40c64e33d --- ...rmissions-add-reload_delta-parameter.patch | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/debian/patches/upstream/permissions-add-reload_delta-parameter.patch b/debian/patches/upstream/permissions-add-reload_delta-parameter.patch index a20032539..423cbeca2 100644 --- a/debian/patches/upstream/permissions-add-reload_delta-parameter.patch +++ b/debian/patches/upstream/permissions-add-reload_delta-parameter.patch @@ -1,4 +1,3 @@ -From 01fa7503433f4e23dea156e1034a87bbb49a4a1d Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Thu, 5 Nov 2020 12:12:38 +0100 Subject: [PATCH] permissions: add reload_delta parameter @@ -6,13 +5,13 @@ Subject: [PATCH] permissions: add reload_delta parameter - make the rate limit of maximum allowed RPC reload configurable using the new 'reload_delta' paramenter. --- - src/modules/permissions/permissions.c | 4 ++++ + src/modules/permissions/permissions.c | 5 +++++ src/modules/permissions/permissions.h | 1 + src/modules/permissions/rpc.c | 8 +++++--- - 3 files changed, 10 insertions(+), 3 deletions(-) + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c -index 7e447d14d2..7dd6d981c6 100644 +index 6b45619..9d9e6d0 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -60,6 +60,7 @@ static char* perm_deny_suffix = ".deny"; @@ -23,7 +22,15 @@ index 7e447d14d2..7dd6d981c6 100644 /* for allow_trusted function */ int perm_db_mode = DISABLE_CACHE; /* Database usage mode: 0=no cache, 1=cache */ -@@ -594,6 +595,9 @@ static int mod_init(void) +@@ -186,6 +187,7 @@ static param_export_t params[] = { + {"port_col", PARAM_STR, &perm_port_col }, + {"max_subnets", PARAM_INT, &_perm_max_subnets }, + {"load_backends", PARAM_INT, &_perm_load_backends }, ++ {"reload_delta", PARAM_INT, &perm_reload_delta }, + {0, 0, 0} + }; + +@@ -594,6 +596,9 @@ static int mod_init(void) } *perm_rpc_reload_time = 0; @@ -34,7 +41,7 @@ index 7e447d14d2..7dd6d981c6 100644 LM_ERR("failed to register RPC commands\n"); return -1; diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h -index c094185626..2a417ffd58 100644 +index c094185..2a417ff 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -59,6 +59,7 @@ extern str perm_ip_addr_col; /* Name of ip address column */ @@ -46,7 +53,7 @@ index c094185626..2a417ffd58 100644 /* backends to be loaded */ #define PERM_LOAD_ADDRESSDB (1<<0) diff --git a/src/modules/permissions/rpc.c b/src/modules/permissions/rpc.c -index b6a6f9a420..cff9523406 100644 +index b6a6f9a..cff9523 100644 --- a/src/modules/permissions/rpc.c +++ b/src/modules/permissions/rpc.c @@ -30,13 +30,15 @@ @@ -68,6 +75,3 @@ index b6a6f9a420..cff9523406 100644 LM_ERR("ongoing reload\n"); rpc->fault(ctx, 500, "ongoing reload"); return -1; --- -2.20.1 -