diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-22 17:23:08 +0200 |
| commit | 0fa5486a4ace7a9be82b37979cf4693aff237340 (patch) | |
| tree | 6c1b10bca2629acc171c1bb8719ef9fe6202a5c0 /plugins/imgssapi/imgssapi.c | |
| parent | 737614054caadf8340b638b368d43f55b7bb3741 (diff) | |
| parent | aba90e82484118f3568ec51c01de5ba845da589a (diff) | |
| download | rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.gz rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.tar.bz2 rsyslog-0fa5486a4ace7a9be82b37979cf4693aff237340.zip | |
Merge branch 'master' into ultra-reliable
Conflicts:
runtime/rsyslog.h
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'plugins/imgssapi/imgssapi.c')
| -rw-r--r-- | plugins/imgssapi/imgssapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c index b9d7dfe3..d8791880 100644 --- a/plugins/imgssapi/imgssapi.c +++ b/plugins/imgssapi/imgssapi.c @@ -9,7 +9,7 @@ * NOTE: read comments in module-template.h to understand how this file * works! * - * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007, 2009 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -330,7 +330,7 @@ addGSSListener(void __attribute__((unused)) *pVal, uchar *pNewVal) CHKiRet(tcpsrv.SetCBOnSessAccept(pOurTcpsrv, onSessAccept)); CHKiRet(tcpsrv.SetCBOnRegularClose(pOurTcpsrv, onRegularClose)); CHKiRet(tcpsrv.SetCBOnErrClose(pOurTcpsrv, onErrClose)); - tcpsrv.configureTCPListen(pOurTcpsrv, (char *) pNewVal); + tcpsrv.configureTCPListen(pOurTcpsrv, pNewVal); CHKiRet(tcpsrv.ConstructFinalize(pOurTcpsrv)); } |