summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Kubina <xkubina@fi.muni.cz>2009-11-25 14:47:39 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-25 14:47:39 +0100
commit52a0120a3845bd17855156dd59ed6beaf9658e0f (patch)
tree12c3b792cf7e0d6bc1a85c1416444e4ad1be619f
parenta5ca9993258f6293f61fae3e0b3df458f454bec5 (diff)
downloadrsyslog-52a0120a3845bd17855156dd59ed6beaf9658e0f.tar.gz
rsyslog-52a0120a3845bd17855156dd59ed6beaf9658e0f.tar.xz
rsyslog-52a0120a3845bd17855156dd59ed6beaf9658e0f.zip
bugfix: enabling GSSServer crashes rsyslog startup
-rw-r--r--ChangeLog4
-rw-r--r--plugins/imgssapi/imgssapi.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 01402310..bdb70af7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------
+Version 5.2.2 [v5-stable] (rgerhards), 2009-11-??
+- bugfix: enabling GSSServer crashes rsyslog startup
+ Thanks to Tomas Kubina for the patch [imgssapi]
+---------------------------------------------------------------------------
Version 5.2.1 [v5-stable] (rgerhards), 2009-11-02
- bugfix [imported from 4.4.3]: $ActionExecOnlyOnceEveryInterval did
not work.
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c
index f9c1f86b..111ed595 100644
--- a/plugins/imgssapi/imgssapi.c
+++ b/plugins/imgssapi/imgssapi.c
@@ -48,6 +48,7 @@
#include "dirty.h"
#include "cfsysline.h"
#include "module-template.h"
+#include "unicode-helper.h"
#include "net.h"
#include "srUtils.h"
#include "gss-misc.h"
@@ -330,6 +331,7 @@ addGSSListener(void __attribute__((unused)) *pVal, uchar *pNewVal)
CHKiRet(tcpsrv.SetCBOnSessAccept(pOurTcpsrv, onSessAccept));
CHKiRet(tcpsrv.SetCBOnRegularClose(pOurTcpsrv, onRegularClose));
CHKiRet(tcpsrv.SetCBOnErrClose(pOurTcpsrv, onErrClose));
+ CHKiRet(tcpsrv.SetInputName(pOurTcpsrv, UCHAR_CONSTANT("imgssapi")));
tcpsrv.configureTCPListen(pOurTcpsrv, pNewVal);
CHKiRet(tcpsrv.ConstructFinalize(pOurTcpsrv));
}