From 452da872c5f7b8ca55c373688544ac7a68de129e Mon Sep 17 00:00:00 2001 From: Alvaro Date: Wed, 12 Jun 2019 12:33:14 +0200 Subject: [PATCH] [Improvement] Update the Pound version information [Bugfix] Segfault reloading WAF rules Signed-off-by: Alvaro modified: configure modified: pound.h modified: poundctl.c modified: svc.c --- configure | 4 ++-- pound.h | 2 +- poundctl.c | 2 +- svc.c | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 3c965be..77bbe99 100755 --- a/configure +++ b/configure @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pound' PACKAGE_TARNAME='pound' -PACKAGE_VERSION='pound2.8a+zevenet5' -PACKAGE_STRING='pound 2.8a+zevenet5' +PACKAGE_VERSION='pound2.8a+zevenet' +PACKAGE_STRING='pound 2.8a+zevenet' PACKAGE_BUGREPORT='roseg@apsis.ch' PACKAGE_URL='' diff --git a/pound.h b/pound.h index f0fc8a2..d7bbac6 100644 --- a/pound.h +++ b/pound.h @@ -680,7 +680,7 @@ extern int connect_nb(const int, const struct addrinfo *, const int, char *); */ extern void config_parse(const int, char **const); -extern void onfig_parse_waf(void); +extern void config_parse_waf(int); /* * RSA ephemeral keys: how many and how often diff --git a/poundctl.c b/poundctl.c index 48b3471..e6157c4 100644 --- a/poundctl.c +++ b/poundctl.c @@ -371,7 +371,7 @@ main(const int argc, char **argv) cmd.cmd = REL_WAF; sock = get_sock(sock_name); - write(sock, &cmd, sizeof(cmd)); + write(sock, (void *)&cmd, sizeof(cmd)); if (!is_set) { int n; diff --git a/svc.c b/svc.c index 0015240..8721a34 100644 --- a/svc.c +++ b/svc.c @@ -2098,6 +2098,7 @@ thr_control(void *arg) break; #if WAF case REL_WAF: + logmsg(LOG_INFO, "Reloading WAF rules"); config_parse_waf(1); waf_reload_rules(); break;