OpenBSD CVS

CVS log for src/usr.sbin/smtpd/table.5


[BACK] Up to [local] / src / usr.sbin / smtpd

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.14 / (download) - annotate - [select for diffs], Thu May 2 18:14:33 2024 UTC (5 weeks, 2 days ago) by op
Branch: MAIN
CVS Tags: HEAD
Changes since 1.13: +12 -9 lines
Diff to previous 1.13 (colored)

unbreak parsing of IPv6 addresses in file-backed table(5)s

The file parser splits the line on the ':' character too for key-value
tables, and so mis-parses IPv6 addresses.  The "::1 localhost" example
in table(5) is actually parsed as key "" and value ":1 localhost".

For list tables, the "# @list" marker can be used as a workaround, but
for key-valued the parser has to be fixed.

There are also some weird edge cases when splitting the lines.

Now the parser always splits on the first whitespace or colon, and then
strips the spaces.  For lines starting with '[' the parser will jump to
the matching ']' before attempting to split.  So, for example:

	[::1]:localhost		becomes	"[::1]" -> "localhost"
	[::1] example.org	becomes	"[::1]" -> "example.org"
	foo: bar		becomes "foo" -> "bar"
	foo::bar		becomes "foo" -> ":bar"
	foo : bar		becomes "foo" -> ": bar"

etc...

This only affects the parser for file table(5)s and makemap(8).  Inline
tables or "proc" tables are unaffected.

ok gilles@

Revision 1.13 / (download) - annotate - [select for diffs], Wed Dec 27 11:29:56 2023 UTC (5 months, 1 week ago) by op
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5
Changes since 1.12: +13 -7 lines
Diff to previous 1.12 (colored)

sync table(5) with reality

There are two different parser for table(5)s with different edge cases.
Adjust the documentation to what the strictier of the two (smtpd
internal parser) accepts, even if makemap(8) allows for more.

In particular, adjust the description for the comments (that cannot be
'anywhere in the file'), document the special comment @list and mention
that splitting is done on the colon character too.

ok and many improvements from jmc@

Revision 1.12 / (download) - annotate - [select for diffs], Sat Feb 13 08:05:57 2021 UTC (3 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.11: +4 -4 lines
Diff to previous 1.11 (colored)

readability fixes; from larry hynes

Revision 1.11 / (download) - annotate - [select for diffs], Sun Aug 11 13:00:57 2019 UTC (4 years, 9 months ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.10: +3 -5 lines
Diff to previous 1.10 (colored)

no longer document that username may be omitted if equal to label, this is
not true anymore.

Revision 1.10 / (download) - annotate - [select for diffs], Wed Sep 5 07:19:35 2018 UTC (5 years, 9 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.9: +11 -7 lines
Diff to previous 1.9 (colored)

some text improvements from matt schwartz; ok gilles

Revision 1.9 / (download) - annotate - [select for diffs], Thu May 24 20:40:21 2018 UTC (6 years ago) by schwarze
Branch: MAIN
Changes since 1.8: +5 -5 lines
Diff to previous 1.8 (colored)

three forgotten s/-literal/-unfilled/

Revision 1.8 / (download) - annotate - [select for diffs], Thu May 24 15:06:25 2018 UTC (6 years ago) by schwarze
Branch: MAIN
Changes since 1.7: +34 -29 lines
Diff to previous 1.7 (colored)

adapt to the new smtpd.conf(5) format, OK gilles@

Revision 1.7 / (download) - annotate - [select for diffs], Tue Apr 4 14:33:44 2017 UTC (7 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.6: +6 -3 lines
Diff to previous 1.6 (colored)

document comments in table files; help/ok gilles

Revision 1.6 / (download) - annotate - [select for diffs], Mon Feb 6 06:27:01 2017 UTC (7 years, 4 months ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.5: +4 -4 lines
Diff to previous 1.5 (colored)

Bump bcrypt version to $2b$ and increase number of rounds in two examples.

Revision 1.5 / (download) - annotate - [select for diffs], Mon Nov 30 17:03:05 2015 UTC (8 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.4: +5 -9 lines
Diff to previous 1.4 (colored)

change Xrs from now-defunct db(3) to dbopen(3); this wasn;t a
straight replace: thanks both to schwarze and maja for feedback
on how to rewrite parts;

i've snuck in an rcs id->openbsd id change in dev_mkdb too;

Revision 1.4 / (download) - annotate - [select for diffs], Tue Feb 4 16:32:36 2014 UTC (10 years, 4 months ago) by eric
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7, OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.3: +1 -0 lines
Diff to previous 1.3 (colored)

update documentation

Revision 1.3 / (download) - annotate - [select for diffs], Sat Nov 30 09:42:52 2013 UTC (10 years, 6 months ago) by eric
Branch: MAIN
Changes since 1.2: +4 -12 lines
Diff to previous 1.2 (colored)

mention smtpctl encrypt subcommand.

Revision 1.2 / (download) - annotate - [select for diffs], Thu Nov 28 10:57:29 2013 UTC (10 years, 6 months ago) by eric
Branch: MAIN
Changes since 1.1: +2 -0 lines
Diff to previous 1.1 (colored)

allow subdomain matching in mailaddr tables

Revision 1.1 / (download) - annotate - [select for diffs], Thu Nov 7 09:24:17 2013 UTC (10 years, 7 months ago) by eric
Branch: MAIN

missing manpage, spotted by jmc@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.