diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-29 16:59:19 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-29 16:59:19 +0100 |
| commit | c4501ebb5263b3b85bc6a854fcc3b6a35e94840a (patch) | |
| tree | 8ecca199cfeba599e1465e4426b55ca9a67da3b0 /runtime/glbl.c | |
| parent | 56e2157bae6e5ad9e64ef672735a6e6e45e34312 (diff) | |
| parent | a98b1822a389cd209cb7a6660060abf995fbf715 (diff) | |
| download | rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.tar.gz rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.tar.bz2 rsyslog-c4501ebb5263b3b85bc6a854fcc3b6a35e94840a.zip | |
Merge branch 'v7-devel' into tmp
Conflicts:
action.c
Diffstat (limited to 'runtime/glbl.c')
| -rw-r--r-- | runtime/glbl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/glbl.c b/runtime/glbl.c index e1d4e92d..3983a449 100644 --- a/runtime/glbl.c +++ b/runtime/glbl.c @@ -43,6 +43,7 @@ #include "prop.h" #include "atomic.h" #include "errmsg.h" +#include "action.h" #include "rainerscript.h" #include "net.h" @@ -105,6 +106,7 @@ static struct cnfparamdescr cnfparamdescr[] = { { "defaultnetstreamdriverkeyfile", eCmdHdlrString, 0 }, { "defaultnetstreamdriver", eCmdHdlrString, 0 }, { "maxmessagesize", eCmdHdlrSize, 0 }, + { "action.reportsuspension", eCmdHdlrBinary, 0 } }; static struct cnfparamblk paramblk = { CNFPARAMBLK_VERSION, @@ -693,6 +695,8 @@ glblDoneLoadCnf(void) } else if(!strcmp(paramblk.descr[i].name, "dropmsgswithmaliciousdnsptrrecords")) { bDropMalPTRMsgs = (int) cnfparamvals[i].val.d.n; + } else if(!strcmp(paramblk.descr[i].name, "action.reportsuspension")) { + bActionReportSuspension = (int) cnfparamvals[i].val.d.n; } else if(!strcmp(paramblk.descr[i].name, "maxmessagesize")) { iMaxLine = (int) cnfparamvals[i].val.d.n; } else { |