summaryrefslogtreecommitdiffstats
path: root/plugins/imgssapi
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-03-11 15:15:34 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-03-11 15:15:34 +0100
commitae7a01e137f14055f9472408d0cf3ebf9893afba (patch)
tree37af475499d6dd82b986f34c4a53db2ecbd071bd /plugins/imgssapi
parent24a36fd14226ccf5f139c07252f05f3db124604e (diff)
parent7f43af08fec0824c30c5bb1ddb9b96427828c987 (diff)
downloadrsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.gz
rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.xz
rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'plugins/imgssapi')
-rw-r--r--plugins/imgssapi/imgssapi.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c
index fcc930ea..debe935e 100644
--- a/plugins/imgssapi/imgssapi.c
+++ b/plugins/imgssapi/imgssapi.c
@@ -268,7 +268,8 @@ doOpenLstnSocks(tcpsrv_t *pSrv)
if(pGSrv->allowedMethods) {
/* fallback to plain TCP */
CHKiRet(tcpsrv.create_tcp_socket(pSrv));
- dbgprintf("Opened %d syslog TCP port(s).\n", *pRet);
+ } else {
+ ABORT_FINALIZE(RS_RET_GSS_ERR);
}
}
@@ -335,6 +336,11 @@ addGSSListener(void __attribute__((unused)) *pVal, uchar *pNewVal)
}
finalize_it:
+ if(iRet != RS_RET_OK) {
+ errmsg.LogError(0, NO_ERRCODE, "error %d trying to add listener", iRet);
+ if(pOurTcpsrv != NULL)
+ tcpsrv.Destruct(&pOurTcpsrv);
+ }
RETiRet;
}