This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 3925a0db6cc0ca91fe34eb7c0366f72b0af39ab6 (commit) from acbc11f342cbcf14a16d8e26fef69209998e097d (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 3925a0db6cc0ca91fe34eb7c0366f72b0af39ab6 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jan 30 20:54:46 2018 +0000

syslogdctrl: Fix sed syntax issues

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: src/misc-progs/syslogdctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

Difference in files: 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 */

hooks/post-receive -- IPFire 2.x development tree