diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 13:49:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 13:49:36 +0200 |
| commit | 99b3b670e81bff0afc877f52cd261b354444aec1 (patch) | |
| tree | 381447d88883777b46965db0dd3e75921b21d58a /plugins/omudpspoof | |
| parent | d72fe36f868ea12f246ed23bb81ece0240dd6c12 (diff) | |
| parent | aef0aba9cd00fb225d2803210586b86a13547ce0 (diff) | |
| download | rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.tar.gz rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.tar.xz rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.zip | |
Merge branch 'master' into tmp
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/omudpspoof/omudpspoof.c
runtime/rsyslog.h
also updated omuxsock and imptcp to new interfaces
Diffstat (limited to 'plugins/omudpspoof')
| -rw-r--r-- | plugins/omudpspoof/omudpspoof.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c index 684e54df..1df1f69b 100644 --- a/plugins/omudpspoof/omudpspoof.c +++ b/plugins/omudpspoof/omudpspoof.c @@ -395,6 +395,7 @@ ENDdoAction BEGINparseSelectorAct + uchar *sourceTpl; CODESTARTparseSelectorAct CODE_STD_STRING_REQUESTparseSelectorAct(2) /* first check if this config line is actually for us */ @@ -406,10 +407,8 @@ CODE_STD_STRING_REQUESTparseSelectorAct(2) p += sizeof(":omudpspoof:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ CHKiRet(createInstance(&pData)); - if(cs.pszSourceNameTemplate == NULL) { - errmsg.LogError(0, NO_ERRCODE, "No $ActionOMUDPSpoofSourceNameTemplate given, can not continue with this action."); - ABORT_FINALIZE(RS_RET_NO_SRCNAME_TPL); - } + sourceTpl = (cs.pszSourceNameTemplate == NULL) ? UCHAR_CONSTANT("RSYSLOG_omudpspoofDfltSourceTpl") + : cs.pszSourceNameTemplate; if(cs.pszTargetHost == NULL) { errmsg.LogError(0, NO_ERRCODE, "No $ActionOMUDPSpoofTargetHost given, can not continue with this action."); |