From acbc11f342cbcf14a16d8e26fef69209998e097d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 30 Jan 2018 20:06:14 +0000 Subject: [PATCH 1/3] core118: Ship changed ovpnmain.cgi Signed-off-by: Michael Tremer --- config/rootfiles/core/118/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files index b46a8871a..d58862612 100644 --- a/config/rootfiles/core/118/filelists/files +++ b/config/rootfiles/core/118/filelists/files @@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/fireinfo.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi usr/lib/firewall/rules.pl usr/local/bin/syslogdctrl usr/sbin/updxlrator From 3925a0db6cc0ca91fe34eb7c0366f72b0af39ab6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 30 Jan 2018 20:54:46 +0000 Subject: [PATCH 2/3] syslogdctrl: Fix sed syntax issues Signed-off-by: Michael Tremer --- src/misc-progs/syslogdctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c index 6d7dfacaa..d73c42265 100644 --- a/src/misc-progs/syslogdctrl.c +++ b/src/misc-progs/syslogdctrl.c @@ -118,18 +118,18 @@ int main(void) if (strcmp(protocol, "tcp") == 0) { /* write line for TCP */ - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+\\)@@\\?.\\+$/\\1@@%s/' /etc/syslog.conf >&%d", hostname, config_fd); } else { /* write line for UDP */ - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd ); + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+\\)@@\\?.\\+$/\\1@%s/' /etc/syslog.conf >&%d", hostname, config_fd); } } else { /* if remote syslog has been disabled */ - snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd ); + snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@@\\?.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd ); } /* if the return code isn't 0 failsafe */ From 0da2f155fdfa9b060840e9d7ee6229577cb52162 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 31 Jan 2018 13:00:44 +0000 Subject: [PATCH 3/3] core118: Ship changed vpnmain.cgi Signed-off-by: Michael Tremer --- config/rootfiles/core/118/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files index d58862612..22d1c7cc9 100644 --- a/config/rootfiles/core/118/filelists/files +++ b/config/rootfiles/core/118/filelists/files @@ -12,6 +12,7 @@ srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/rules.pl usr/local/bin/syslogdctrl usr/sbin/updxlrator