summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-20 08:31:03 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-20 08:31:03 +0200
commitc0e35e864aebef9de367f736e8b73a3f3753c7f9 (patch)
tree8568ab9e98693c5ed7dfbef18c2192a59d8e2388
parentbbfb5662dae6c863e1022153b765046cd17b088b (diff)
downloadrsyslog-c0e35e864aebef9de367f736e8b73a3f3753c7f9.tar.gz
rsyslog-c0e35e864aebef9de367f736e8b73a3f3753c7f9.tar.bz2
rsyslog-c0e35e864aebef9de367f736e8b73a3f3753c7f9.zip
bugfix: config validation run did not always return correct return state
-rw-r--r--ChangeLog1
-rw-r--r--tools/syslogd.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e840726..8504f1a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ Version 6.5.1 [devel] 2012-08-??
- bugfix: small memory leaks in template() statements
these were one-time memory leaks during startup, so they did NOT grow
during runtime
+- bugfix: config validation run did not always return correct return state
---------------------------------------------------------------------------
Version 6.5.0 [devel] 2012-08-28
- imrelp now supports non-cancel thread termination
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 219b41ab..152c27ae 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2108,6 +2108,7 @@ finalize_it:
} else if(iRet != RS_RET_OK) {
fprintf(stderr, "rsyslogd: run failed with error %d (see rsyslog.h "
"or try http://www.rsyslog.com/e/%d to learn what that number means)\n", iRet, iRet*-1);
+ exit(1);
}
ENDfunc