diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:19:19 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:19:19 +0200 |
| commit | f7ad5aeff03833879957ef00136610d1138a7212 (patch) | |
| tree | 7184cfd244339efc014f4007829ec316ab4aa0b3 /plugins | |
| parent | 4e11040e04c7147f9787e2a496591f7ada190480 (diff) | |
| parent | d788daafa4e8bda5fe544718b5f420f22cd79996 (diff) | |
| download | rsyslog-f7ad5aeff03833879957ef00136610d1138a7212.tar.gz rsyslog-f7ad5aeff03833879957ef00136610d1138a7212.tar.xz rsyslog-f7ad5aeff03833879957ef00136610d1138a7212.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/pmaixforwardedfrom/pmaixforwardedfrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c index fa4a9087..fe3e85fa 100644 --- a/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c +++ b/plugins/pmaixforwardedfrom/pmaixforwardedfrom.c @@ -1,6 +1,6 @@ /* pmaixforwardedfrom.c * - * this detects logs sent by Cisco devices that mangle their syslog output when you tell them to log by name by adding ' :' between the name and the %XXX-X-XXXXXXX: tag + * this cleans up messages forwarded from AIX * * instead of actually parsing the message, this modifies the message and then falls through to allow a later parser to handle the now modified message * |