Commit e19312d
committed
Document and handle include ordering for stop-processing
Stop-processing block prefixes (!!, ++, ::) can only suppress rules
that follow in the parsed order. A snippet in /etc/syslog.d/ cannot
gate rules that were already parsed from the main config file above
the include line.
Fix this by moving the include directive in the shipped syslog.conf to
sit before the general catch-all rules, so snippets are evaluated first
and their stop-blocks take effect.
Document the ordering constraint in two places in syslog.conf(5):
in the include description, where the interaction is explained and
the shipped file's structure is called out; and in the Stop Processing
example section, where a direct note warns users who place stop-blocks
in syslog.d/ snippets.
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>1 parent 2ae1a49 commit e19312d
2 files changed
Lines changed: 45 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
390 | 390 | | |
391 | 391 | | |
392 | 392 | | |
393 | | - | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
394 | 412 | | |
395 | | - | |
| 413 | + | |
| 414 | + | |
396 | 415 | | |
397 | 416 | | |
398 | 417 | | |
| |||
908 | 927 | | |
909 | 928 | | |
910 | 929 | | |
| 930 | + | |
| 931 | + | |
| 932 | + | |
| 933 | + | |
| 934 | + | |
| 935 | + | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
| 940 | + | |
| 941 | + | |
| 942 | + | |
| 943 | + | |
911 | 944 | | |
912 | 945 | | |
913 | 946 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
11 | 18 | | |
12 | 19 | | |
13 | 20 | | |
| |||
16 | 23 | | |
17 | 24 | | |
18 | 25 | | |
| 26 | + | |
| 27 | + | |
19 | 28 | | |
20 | 29 | | |
21 | 30 | | |
| |||
77 | 86 | | |
78 | 87 | | |
79 | 88 | | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
| |||
0 commit comments