Merge branch 'v5-stable' into beta

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/Makefile.am

2 files changed, 21 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index f598dd58..8b0cf354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 Version 5.3.6  [BETA] (rgerhards), 2009-11-??
 - bugfix: omfile output was only written when buffer was full, not at
   end of transaction
+- bugfix: enabling GSSServer crashes rsyslog startup
+  Thanks to Tomas Kubina for the patch [imgssapi]
 ---------------------------------------------------------------------------
 Version 5.3.5  [BETA] (rgerhards), 2009-11-13
 - some light performance enhancement by replacing time() call with much
@@ -116,6 +118,23 @@ Version 5.3.0  [DEVEL] (rgerhards), 2009-09-14
   slightly better performance (just slightly because we called select()
   rather infrequently on a busy system)
 ---------------------------------------------------------------------------
+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.
+- bugfix: segfault on startup when -q or -Q option was given
+  [imported from v3-stable]
+---------------------------------------------------------------------------
+Version 5.2.0  [v5-stable] (rgerhards), 2009-11-02
+This is a re-release of version 5.1.6 as stable after we did not get any bug 
+reports during the whole beta phase. Still, this first v5-stable may not be 
+as stable as one hopes for, I am not sure if we did not get bug reports
+just because nobody tried it. Anyhow, we need to go forward and so we
+have the initial v5-stable.
+---------------------------------------------------------------------------
 Version 5.1.6  [v5-beta] (rgerhards), 2009-10-15
 - feature imports from v4.5.6
 - bugfix: potential race condition when queue worker threads were
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c
index 14830ce2..1d4e3b4f 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"
@@ -331,6 +332,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));
 	}