From 29b95dc1c1cc8020e3fb7d00610fb226cae1bd98 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 14 Mar 2008 17:06:55 +0000
Subject: bugfix: duplicate public symbol in omfwd and omgssapi could lead to  
   segfault. thanks to varmojfekoj for the patch.

---
 ChangeLog                   | 2 ++
 omfwd.c                     | 2 +-
 plugins/omgssapi/omgssapi.c | 2 +-
 plugins/omrelp/omrelp.c     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 648c6cca..68b55715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Version 3.12.3 (rgerhards), 2008-03-??
   situations. If the header was split across two packet reads, it was invalidly
   processed, causing loss or modification of messages.
 - bugfix: memory leak in imfile
+- bugfix: duplicate public symbol in omfwd and omgssapi could lead to
+  segfault. thanks to varmojfekoj for the patch.
 - some more internal cleanup ;)
 ---------------------------------------------------------------------------
 Version 3.12.2 (rgerhards), 2008-03-13
diff --git a/omfwd.c b/omfwd.c
index a284429d..7c68dbf2 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -96,7 +96,7 @@ typedef struct _instanceData {
  * We may change the implementation to try to lookup the port
  * if it is unspecified. So far, we use the IANA default auf 514.
  */
-char *getFwdSyslogPt(instanceData *pData)
+static char *getFwdSyslogPt(instanceData *pData)
 {
 	assert(pData != NULL);
 	if(pData->port == NULL)
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c
index a4fad9b8..57f9cf32 100644
--- a/plugins/omgssapi/omgssapi.c
+++ b/plugins/omgssapi/omgssapi.c
@@ -108,7 +108,7 @@ static enum gss_mode_t {
  * We may change the implementation to try to lookup the port
  * if it is unspecified. So far, we use the IANA default auf 514.
  */
-char *getFwdSyslogPt(instanceData *pData)
+static char *getFwdSyslogPt(instanceData *pData)
 {
 	assert(pData != NULL);
 	if(pData->port == NULL)
diff --git a/plugins/omrelp/omrelp.c b/plugins/omrelp/omrelp.c
index 9dd75a84..5d99d36f 100644
--- a/plugins/omrelp/omrelp.c
+++ b/plugins/omrelp/omrelp.c
@@ -90,7 +90,7 @@ typedef struct _instanceData {
  * We may change the implementation to try to lookup the port
  * if it is unspecified. So far, we use the IANA default auf 514.
  */
-char *getFwdSyslogPt(instanceData *pData)
+static char *getFwdSyslogPt(instanceData *pData)
 {
 	assert(pData != NULL);
 	if(pData->port == NULL)
-- 
cgit v1.2.3