diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 17:13:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 17:13:08 +0200 |
| commit | d3eb89a5fe1dbcda028c0ab5e6753578716539d7 (patch) | |
| tree | 9a6da2266542fb772bc996b6d245403ecdfd126c /runtime/msg.h | |
| parent | 4e511087c413629120315fe5dd26f966ac1ef6fb (diff) | |
| parent | 587036bfb03167d86b0a2fbfe998db1a916cabb3 (diff) | |
| download | rsyslog-d3eb89a5fe1dbcda028c0ab5e6753578716539d7.tar.gz rsyslog-d3eb89a5fe1dbcda028c0ab5e6753578716539d7.tar.xz rsyslog-d3eb89a5fe1dbcda028c0ab5e6753578716539d7.zip | |
Merge branch 'v4-devel' into master
Conflicts:
runtime/msg.h
Diffstat (limited to 'runtime/msg.h')
| -rw-r--r-- | runtime/msg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/msg.h b/runtime/msg.h index b4b6d9f8..712609f6 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -129,6 +129,7 @@ struct msg { #define PARSE_HOSTNAME 0x020 /* parse the hostname during message parsing */ #define NEEDS_DNSRESOL 0x040 /* fromhost address is unresolved and must be locked up via DNS reverse lookup first */ #define NEEDS_ACLCHK_U 0x080 /* check UDP ACLs after DNS resolution has been done in main queue consumer */ +#define NO_PRI_IN_RAW 0x100 /* rawmsg does not include a PRI (Solaris!), but PRI is already set correctly in the msg object */ /* function prototypes |