diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-17 10:48:39 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-17 10:48:39 +0100 |
| commit | 37e4aab1ecc63db2b5e72fd8a5df5e4976ae82c8 (patch) | |
| tree | 9db8aec809487aebf97889b801bfeb0c477e824c /action.c | |
| parent | 76c4d6b951453078ab53bf612caf0b8ec9d54bb8 (diff) | |
| parent | 9911dacf59e898bae2c8c6619b85348bf54ddc23 (diff) | |
| download | rsyslog-37e4aab1ecc63db2b5e72fd8a5df5e4976ae82c8.tar.gz rsyslog-37e4aab1ecc63db2b5e72fd8a5df5e4976ae82c8.tar.xz rsyslog-37e4aab1ecc63db2b5e72fd8a5df5e4976ae82c8.zip | |
Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/syslogd.c
Diffstat (limited to 'action.c')
| -rw-r--r-- | action.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1798,7 +1798,7 @@ addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringReques } /* check required template options */ if( (iTplOpts & OMSR_RQD_TPL_OPT_SQL) - && (pAction->ppTpl[i]->optFormatForSQL == 0)) { + && (pAction->ppTpl[i]->optFormatEscape == 0)) { errno = 0; errmsg.LogError(0, RS_RET_RQD_TPLOPT_MISSING, "Action disabled. To use this action, you have to specify " "the SQL or stdSQL option in your template!\n"); |