Merge branch 'v4-beta' into beta

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f7322eb8..99fac9d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -129,6 +129,11 @@ increase.
   output module interface
 ---------------------------------------------------------------------------
 Version 4.5.6  [v4-beta] (rgerhards), 2009-09-??
+- bugfix(minor): diag function returned wrong queue memeber count
+  for the main queue if an active DA queue existed. This had no relevance
+  to real deployments (assuming they are not running the debug/diagnostic
+  module...), but sometimes caused grief and false alerts in the 
+  testbench.
 - included some important fixes from v4-stable:
   * bugfix: invalid handling of zero-sized messages
   * bugfix: zero-sized UDP messages are no longer processed
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 895ac5d6..165c751b 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -413,7 +413,8 @@ diagGetMainMsgQSize(int *piSize)
 {
 	DEFiRet;
 	assert(piSize != NULL);
-	*piSize = pMsgQueue->iQueueSize;
+	*piSize = (pMsgQueue->pqDA != NULL) ? pMsgQueue->pqDA->iQueueSize : 0;
+	*piSize += pMsgQueue->iQueueSize;
 	RETiRet;
 }