OpenBSD CVS

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


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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.271 / (download) - annotate - [select for diffs], Sun Mar 24 06:22:18 2024 UTC (2 months, 2 weeks ago) by jsg
Branch: MAIN
CVS Tags: HEAD
Changes since 1.270: +3 -3 lines
Diff to previous 1.270 (colored)

permament -> permanent

Revision 1.270 / (download) - annotate - [select for diffs], Mon Mar 18 08:48:50 2024 UTC (2 months, 3 weeks ago) by op
Branch: MAIN
Changes since 1.269: +54 -22 lines
Diff to previous 1.269 (colored)

improve the MDA documentation

 - add a pointer to the section when documenting the `mda' keyword
 - rename the section to MDA COMMANDS
 - document also what happens when the MDA doesn't exit with status 0
 - add the missing environment variables
 - sort the variables
 - minor other tweaks to the text

with several improvements from jmc, ok jmc

Revision 1.269 / (download) - annotate - [select for diffs], Fri Mar 15 21:56:22 2024 UTC (2 months, 3 weeks ago) by op
Branch: MAIN
Changes since 1.268: +29 -1 lines
Diff to previous 1.268 (colored)

add some initial documentation regarding MDAs

this adds some initial commentary for how MDAs should behave and
in what environment they are executed.

diff from Philipp (philipp+openbsd [at] bureaucracy [dot] de) with
some tweaks from Richard Toohey and me.

ok gilles@

Revision 1.268 / (download) - annotate - [select for diffs], Sat Feb 3 20:46:57 2024 UTC (4 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5
Changes since 1.267: +3 -3 lines
Diff to previous 1.267 (colored)

missing "s" after apostrophe;

Revision 1.267 / (download) - annotate - [select for diffs], Sat Feb 3 15:41:02 2024 UTC (4 months ago) by op
Branch: MAIN
Changes since 1.266: +6 -2 lines
Diff to previous 1.266 (colored)

document that when an alternate delivery user is provided in a
dispatcher, no .forward file except that of the alternate delivery user
is processed.

ok gilles@, millert@

Revision 1.266 / (download) - annotate - [select for diffs], Sun Dec 3 11:52:16 2023 UTC (6 months ago) by op
Branch: MAIN
Changes since 1.265: +4 -2 lines
Diff to previous 1.265 (colored)

add the `no-dsn' option to `listen on socket' too

ok millert@

Revision 1.265 / (download) - annotate - [select for diffs], Fri May 19 15:18:06 2023 UTC (12 months, 3 weeks ago) by op
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4
Changes since 1.264: +3 -3 lines
Diff to previous 1.264 (colored)

fix markup for `maildir' in smtpd.conf(5)

pathname and junk are both optional, but indipendently so.

ok aisha, millert

Revision 1.264 / (download) - annotate - [select for diffs], Thu Mar 2 17:09:53 2023 UTC (15 months, 1 week ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.263: +3 -3 lines
Diff to previous 1.263 (colored)

improve the Nd lines such that the format is consistent for the
various *d, *conf, *ctl files (where relevant) and simple;

also makes "man -k routing" more useful;

help from claudio and florian
ok claudio florian millert

Revision 1.263 / (download) - annotate - [select for diffs], Thu Mar 31 17:27:31 2022 UTC (2 years, 2 months ago) by naddy
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.262: +3 -3 lines
Diff to previous 1.262 (colored)

man pages: add missing commas between subordinate and main clauses

jmc@ dislikes a comma before "then" in a conditional, so leave those
untouched.

ok jmc@

Revision 1.262 / (download) - annotate - [select for diffs], Sun Nov 21 06:48:15 2021 UTC (2 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.261: +11 -4 lines
Diff to previous 1.261 (colored)

smtpd-filters.7 referred to itself internally as just filters(7): fix that,
and put some Xr in smtpd.conf.5 so people can find it;

from leon fischer

Revision 1.261 / (download) - annotate - [select for diffs], Thu Aug 5 06:33:20 2021 UTC (2 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.260: +11 -6 lines
Diff to previous 1.260 (colored)

rework the "host relay-url" text block a little so it reads better,
and formats a bit nicer;

while here, wrap lines to <80;

Revision 1.260 / (download) - annotate - [select for diffs], Fri Apr 9 16:43:43 2021 UTC (3 years, 2 months ago) by eric
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9
Changes since 1.259: +14 -2 lines
Diff to previous 1.259 (colored)

allow to specify tls ciphers and protocols on listeners

ok tb@

Revision 1.259 / (download) - annotate - [select for diffs], Wed Mar 31 17:47:16 2021 UTC (3 years, 2 months ago) by eric
Branch: MAIN
Changes since 1.258: +14 -2 lines
Diff to previous 1.258 (colored)

allow to specify tls protocols and ciphers on relay actions

ok espie@ sthen@ tb@

Revision 1.258 / (download) - annotate - [select for diffs], Fri Mar 5 12:37:32 2021 UTC (3 years, 3 months ago) by eric
Branch: MAIN
Changes since 1.257: +12 -29 lines
Diff to previous 1.257 (colored)

Start porting smtpd to libtls.

Note that it changes the way SNI works: The certificate to use is now
selected by looking at the names found in the certificates themselves,
rather than the names of the pki entries in the configuration file.
The set of certificates for a tls listener must be defined explicitly by
using the pki listener option multiple times.

ok tb@

Revision 1.257 / (download) - annotate - [select for diffs], Sat Feb 13 07:59:54 2021 UTC (3 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.256: +19 -19 lines
Diff to previous 1.256 (colored)

various readability fixes; from larry hynes

Revision 1.256 / (download) - annotate - [select for diffs], Wed Jan 27 14:59:10 2021 UTC (3 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.255: +4 -4 lines
Diff to previous 1.255 (colored)

mark up fixes; from lyndon

Revision 1.255 / (download) - annotate - [select for diffs], Wed Sep 23 19:11:50 2020 UTC (3 years, 8 months ago) by martijn
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.254: +0 -27 lines
Diff to previous 1.254 (colored)

Revert agentx support for now, we're too close to release.

requested by deraadt@

Revision 1.254 / (download) - annotate - [select for diffs], Wed Sep 23 18:01:27 2020 UTC (3 years, 8 months ago) by martijn
Branch: MAIN
Changes since 1.253: +29 -2 lines
Diff to previous 1.253 (colored)

Add support for agentx to smtpd.

This is based around NETWORK-SERVICES-MIB from RFC2788 and MTA-MIB from
RFC2789, but does not export the full spec. Hopefully this will expand in
the future.

People who want to use this against net-snmp (currently the only option
known to me at the time of writing) may want to add -I -mta_sendmail to the
flags, so net-snmp doesn't throw garbage into the mib-2.28 subtree.

Revision 1.253 / (download) - annotate - [select for diffs], Wed Sep 16 11:19:42 2020 UTC (3 years, 8 months ago) by martijn
Branch: MAIN
Changes since 1.252: +7 -2 lines
Diff to previous 1.252 (colored)

Add the admd keyword. This can be used by filters interested in the
Authentication-Results header.

OK giovanni@

Revision 1.252 / (download) - annotate - [select for diffs], Mon Sep 14 13:06:51 2020 UTC (3 years, 8 months ago) by millert
Branch: MAIN
Changes since 1.251: +10 -2 lines
Diff to previous 1.251 (colored)

Document "pki" option for relay delivery too; from Nick Gasson
OK jmc@ martijn@

Revision 1.251 / (download) - annotate - [select for diffs], Thu Aug 27 08:58:30 2020 UTC (3 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.250: +3 -3 lines
Diff to previous 1.250 (colored)

add missing "regex" keyword; from heddi nabbisen
ok martijn

Revision 1.250 / (download) - annotate - [select for diffs], Sat Apr 25 09:20:38 2020 UTC (4 years, 1 month ago) by eric
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7
Changes since 1.249: +13 -5 lines
Diff to previous 1.249 (colored)

point out that the "junk" filter decision adds the X-Spam header

from Ryan Kavanagh

Revision 1.249 / (download) - annotate - [select for diffs], Wed Feb 12 14:46:36 2020 UTC (4 years, 3 months ago) by schwarze
Branch: MAIN
Changes since 1.248: +5 -4 lines
Diff to previous 1.248 (colored)

Standardize argument naming for "sourceaddr" and unify the wording a bit,
similar to what deraadt@ recently did in other manual pages.

Revision 1.248 / (download) - annotate - [select for diffs], Wed Jan 8 10:02:17 2020 UTC (4 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.247: +3 -3 lines
Diff to previous 1.247 (colored)

remove literal tab from a column list;

Revision 1.247 / (download) - annotate - [select for diffs], Wed Jan 8 01:41:11 2020 UTC (4 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.246: +6 -4 lines
Diff to previous 1.246 (colored)

allow using the session username in builtin filters when available

Revision 1.246 / (download) - annotate - [select for diffs], Thu Dec 19 13:34:45 2019 UTC (4 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.245: +3 -3 lines
Diff to previous 1.245 (colored)

tweak previous;

Revision 1.245 / (download) - annotate - [select for diffs], Wed Dec 18 07:57:52 2019 UTC (4 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.244: +5 -1 lines
Diff to previous 1.244 (colored)

teach relay action how to do domain-based relay host, this allows declaring
a single relay action with a mapping of relay hosts per domain.

ok eric@

Revision 1.244 / (download) - annotate - [select for diffs], Tue Dec 17 10:30:20 2019 UTC (4 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.243: +4 -3 lines
Diff to previous 1.243 (colored)

avoid line wrap in the dkimsign filter line;

Revision 1.243 / (download) - annotate - [select for diffs], Tue Dec 17 10:28:31 2019 UTC (4 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.242: +10 -14 lines
Diff to previous 1.242 (colored)

tweak the rspamd bits a little. we really don;t need to repeat the
previous example;

ok gilles

Revision 1.242 / (download) - annotate - [select for diffs], Sat Dec 14 16:24:52 2019 UTC (4 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.241: +2 -1 lines
Diff to previous 1.241 (colored)

introduce a bypass keyword so that builtin filters can bypass processing of
a phase when a condition is met

suggested by several people including jung@, ok jung@

Revision 1.241 / (download) - annotate - [select for diffs], Fri Dec 13 19:58:59 2019 UTC (4 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.240: +2 -2 lines
Diff to previous 1.240 (colored)

fix DKIM example

mistake spotted by jmc@

Revision 1.240 / (download) - annotate - [select for diffs], Fri Dec 13 17:50:45 2019 UTC (4 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.239: +5 -8 lines
Diff to previous 1.239 (colored)

trim previous; ok gilles

Revision 1.239 / (download) - annotate - [select for diffs], Fri Dec 13 00:31:20 2019 UTC (4 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.238: +30 -10 lines
Diff to previous 1.238 (colored)

update examples, document that DKIM signing may be achieved through the
opensmtpd-filter-dkimsign and opensmtpd-filter-rspamd packages without the
queue reinjection trick used for dkimproxy.

Revision 1.238 / (download) - annotate - [select for diffs], Mon Dec 9 16:55:30 2019 UTC (4 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.237: +24 -62 lines
Diff to previous 1.237 (colored)

rework the filtering text somewhat to condense it a little, avoid text
duplication, and make the language a bit more consistent;

ok gilles

Revision 1.237 / (download) - annotate - [select for diffs], Mon Dec 9 15:04:06 2019 UTC (4 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.236: +3 -3 lines
Diff to previous 1.236 (colored)

update the example default config to use "from local" too; from myportslist
ok gilles

Revision 1.236 / (download) - annotate - [select for diffs], Thu Dec 5 14:49:35 2019 UTC (4 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.235: +52 -52 lines
Diff to previous 1.235 (colored)

revert previous; ingo said it

Revision 1.235 / (download) - annotate - [select for diffs], Thu Dec 5 13:54:28 2019 UTC (4 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.234: +54 -54 lines
Diff to previous 1.234 (colored)

replace "Pf < ... Ns >" with Aq; tidy up lists a little;

Revision 1.234 / (download) - annotate - [select for diffs], Thu Dec 5 13:34:39 2019 UTC (4 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.233: +8 -11 lines
Diff to previous 1.233 (colored)

tweak the FILTERING text a little; ok gilles

Revision 1.233 / (download) - annotate - [select for diffs], Tue Nov 26 22:39:04 2019 UTC (4 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.232: +2 -2 lines
Diff to previous 1.232 (colored)

remove stray Oc;

Revision 1.232 / (download) - annotate - [select for diffs], Tue Nov 26 20:42:35 2019 UTC (4 years, 6 months ago) by gilles
Branch: MAIN
Changes since 1.231: +20 -10 lines
Diff to previous 1.231 (colored)

document that listen on socket can have filters attached

original diff from Ryan Kavanagh <rak@debian.org>, slightly rearranged

Revision 1.231 / (download) - annotate - [select for diffs], Tue Nov 26 07:50:01 2019 UTC (4 years, 6 months ago) by gilles
Branch: MAIN
Changes since 1.230: +24 -2 lines
Diff to previous 1.230 (colored)

allow using 'auth' as an origin:

    match from auth [...]

will match any authenticated session, disregarding where it comes from

Revision 1.230 / (download) - annotate - [select for diffs], Tue Nov 26 06:10:20 2019 UTC (4 years, 6 months ago) by gilles
Branch: MAIN
Changes since 1.229: +32 -2 lines
Diff to previous 1.229 (colored)

mail-from and rcpt-to already carry origin and destination, so we can make
them a "for" and "from" parameter and allow grammar to express:

    match from mail-from gilles@openbsd.org for rcpt-to eric@openbsd.org

rather than:

    match from any mail-from gilles@openbsd.org \
	for domain openbsd.org rcpt-to eric@openbsd.org	[...]

ok eric@, jung@, millert@

Revision 1.229 / (download) - annotate - [select for diffs], Mon Nov 25 14:22:59 2019 UTC (4 years, 6 months ago) by gilles
Branch: MAIN
Changes since 1.228: +16 -2 lines
Diff to previous 1.228 (colored)

document that rules can match specific users or user lists now

Revision 1.228 / (download) - annotate - [select for diffs], Tue Nov 19 22:04:04 2019 UTC (4 years, 6 months ago) by gilles
Branch: MAIN
Changes since 1.227: +5 -5 lines
Diff to previous 1.227 (colored)

fix typos in smtpd.conf.5

from Ryan Kavanagh

Revision 1.227 / (download) - annotate - [select for diffs], Tue Nov 12 21:02:42 2019 UTC (4 years, 6 months ago) by gilles
Branch: MAIN
Changes since 1.226: +7 -5 lines
Diff to previous 1.226 (colored)

a long long time ago, there was no such thing as "from socket" and the
socket listener was tagged "local" so we could trick "from local" into
matching non-network connections.

this hack was removed years ago and the socket listener still had this
"local" tag hardcoded. this commit teaches parse.y how to assign a tag
to a socket listener and removes the hardcoded "local".

Revision 1.226 / (download) - annotate - [select for diffs], Fri Sep 20 18:47:23 2019 UTC (4 years, 8 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.225: +3 -4 lines
Diff to previous 1.225 (colored)

tweak previous;

Revision 1.225 / (download) - annotate - [select for diffs], Fri Sep 20 17:46:05 2019 UTC (4 years, 8 months ago) by gilles
Branch: MAIN
Changes since 1.224: +18 -2 lines
Diff to previous 1.224 (colored)

teach smtpd how to do SRS so hosts that act as forwarders don't break SPF.
this basic implementation does SRS0/SRS1 encoding/decoding, validating time
and checksums.

with insight from semarie@, ok eric@ and millert@

Revision 1.224 / (download) - annotate - [select for diffs], Fri Sep 6 08:23:56 2019 UTC (4 years, 9 months ago) by martijn
Branch: MAIN
Changes since 1.223: +13 -2 lines
Diff to previous 1.223 (colored)

Add support for filter-reports. These allow filters to send freetext
reports to other filters/report handlers.
Builtin filters work via the new "report" keyword.
Proc filters can send reports via:
"report|<seconds.<microseconds>|smtp-in|<reqid>|<message>"
Subscribing to these reports can be done via the the "filter-report"
keyword.
The reports themselves contain the usual elements followed by:
<type>|<name>|<message>
Type can be builtin or proc.
Name is the process name for type proc and the filter name for type builtin.

OK gilles@

Revision 1.223 / (download) - annotate - [select for diffs], Wed Sep 4 07:28:27 2019 UTC (4 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.222: +15 -3 lines
Diff to previous 1.222 (colored)

introduce the 'junk' builtin filter action which marks a session or
transaction as junked when a filter matches. this with the maildir
junk option allows classifying messages in Spam folder instead of
rejecting/disconnecting.

ok semarie@, eric@, martijn@

Revision 1.222 / (download) - annotate - [select for diffs], Tue Sep 3 04:48:20 2019 UTC (4 years, 9 months ago) by martijn
Branch: MAIN
Changes since 1.221: +12 -2 lines
Diff to previous 1.221 (colored)

Exectute procs and filters from /usr/local/libexec/smtpd/ if no absolute
path is given.

OK gilles@

Revision 1.221 / (download) - annotate - [select for diffs], Sat Aug 17 14:43:21 2019 UTC (4 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.220: +49 -49 lines
Diff to previous 1.220 (colored)

no need to escape "-", generally speaking; instances remain in EXAMPLES;
(see ingo's notes in mandoc_char.7, if explanation neccessary)

ok schwarze gilles

Revision 1.220 / (download) - annotate - [select for diffs], Mon Aug 12 20:57:31 2019 UTC (4 years, 9 months ago) by tim
Branch: MAIN
Changes since 1.219: +3 -3 lines
Diff to previous 1.219 (colored)

Mark up no-verify with Cm; OK jmc@ gilles@

Revision 1.219 / (download) - annotate - [select for diffs], Sun Aug 11 17:23:12 2019 UTC (4 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.218: +7 -1 lines
Diff to previous 1.218 (colored)

add 'from rdns' to ruleset match criterias making it possible to match
envelopes created by sessions that had or did not have an rDNS:

    match from rdns [...] action "local"
    match !from rdns [...] reject

Revision 1.218 / (download) - annotate - [select for diffs], Sun Aug 11 14:43:52 2019 UTC (4 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.217: +15 -1 lines
Diff to previous 1.217 (colored)

document proc and proc-based filters

Revision 1.217 / (download) - annotate - [select for diffs], Sun Aug 11 14:13:14 2019 UTC (4 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.216: +11 -2 lines
Diff to previous 1.216 (colored)

document filter chains, which is essentially a way to declare a set of
related filters to be applied one after another

Revision 1.216 / (download) - annotate - [select for diffs], Sun Aug 11 13:57:37 2019 UTC (4 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.215: +98 -3 lines
Diff to previous 1.215 (colored)

start documenting the builtin filters

Revision 1.215 / (download) - annotate - [select for diffs], Sat Aug 10 18:11:52 2019 UTC (4 years, 10 months ago) by gilles
Branch: MAIN
Changes since 1.214: +12 -1 lines
Diff to previous 1.214 (colored)

start documenting filters for next release

Revision 1.214 / (download) - annotate - [select for diffs], Sat Aug 10 16:31:15 2019 UTC (4 years, 10 months ago) by gilles
Branch: MAIN
Changes since 1.213: +5 -2 lines
Diff to previous 1.213 (colored)

document proxy-v2 option to listener

Revision 1.213 / (download) - annotate - [select for diffs], Sat Aug 10 13:34:30 2019 UTC (4 years, 10 months ago) by gilles
Branch: MAIN
Changes since 1.212: +11 -1 lines
Diff to previous 1.212 (colored)

documentation was missing 'smtp limit' bits, document them.

spotted by "mabi"

Revision 1.212 / (download) - annotate - [select for diffs], Wed Jul 24 20:44:21 2019 UTC (4 years, 10 months ago) by kn
Branch: MAIN
Changes since 1.211: +8 -3 lines
Diff to previous 1.211 (colored)

Make SMTPS default to port 465 in relay-host

While the other protocols either require an explicit port (LTMP) or
correctly default to 25 for plaintext as well as STARTTLS, SMTP with forced
TLS never happens on 25, so default to the well defined standard instead.

Input and OK gilles

Revision 1.211 / (download) - annotate - [select for diffs], Wed Jul 24 15:31:53 2019 UTC (4 years, 10 months ago) by kmos
Branch: MAIN
Changes since 1.210: +20 -20 lines
Diff to previous 1.210 (colored)

Stop using reserved words in the smtpd.conf configuration examples
in the default smtpd.conf and smtpd.conf(5) manual page. This
eliminates ambiguity in our documentation examples that can cause
confusion.

Input and OK deraadt@ schwarze@ kn@

Revision 1.210 / (download) - annotate - [select for diffs], Sat Dec 22 08:54:02 2018 UTC (5 years, 5 months ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.209: +18 -2 lines
Diff to previous 1.209 (colored)

introduce new matching criteria 'from rdns' to match sessions based on rDNS
of the client, works with literal and tables, both string and regex:

	match from rdns "mx1.poolp.org" for any action blahblah

Revision 1.209 / (download) - annotate - [select for diffs], Sat Dec 22 08:18:55 2018 UTC (5 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.208: +3 -3 lines
Diff to previous 1.208 (colored)

remove space

prompted by jmc@

Revision 1.208 / (download) - annotate - [select for diffs], Fri Dec 21 21:35:29 2018 UTC (5 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.207: +45 -2 lines
Diff to previous 1.207 (colored)

since we already support regex lookups in tables for builtin filters, let's
also support regex lookups in match rule criterias performing table lookups

ok millert@

Revision 1.207 / (download) - annotate - [select for diffs], Wed Dec 12 20:21:04 2018 UTC (5 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.206: +3 -3 lines
Diff to previous 1.206 (colored)

zap trailing whitespace;

Revision 1.206 / (download) - annotate - [select for diffs], Mon Oct 8 06:10:17 2018 UTC (5 years, 8 months ago) by miko
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.205: +3 -3 lines
Diff to previous 1.205 (colored)

typo; ok jmc@ deraadt@

Revision 1.205 / (download) - annotate - [select for diffs], Mon Sep 24 16:14:34 2018 UTC (5 years, 8 months ago) by eric
Branch: MAIN
Changes since 1.204: +9 -4 lines
Diff to previous 1.204 (colored)

Allow to use the "tls" keyword on any relay action to force TLS, with
strict certificate validation.  The "no-verify" becomes optional.

ok gilles@ millert@ semarie@

Revision 1.204 / (download) - annotate - [select for diffs], Mon Sep 10 12:42:17 2018 UTC (5 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.203: +4 -6 lines
Diff to previous 1.203 (colored)

tweak the table commands somewhat; ok gilles

Revision 1.203 / (download) - annotate - [select for diffs], Wed Sep 5 07:16:08 2018 UTC (5 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.202: +4 -4 lines
Diff to previous 1.202 (colored)

do not use the literal string "label" as our example label; ok gilles

Revision 1.202 / (download) - annotate - [select for diffs], Wed Sep 5 05:58:49 2018 UTC (5 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.201: +14 -12 lines
Diff to previous 1.201 (colored)

rework the text about "label" somewhat for clarity; ok eric

Revision 1.201 / (download) - annotate - [select for diffs], Mon Sep 3 13:27:43 2018 UTC (5 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.200: +8 -5 lines
Diff to previous 1.200 (colored)

document "wrapper" in the local section; from matt schwartz
ok gilles

while here, fix some spelling at eol whitespace introduced in previous;

Revision 1.200 / (download) - annotate - [select for diffs], Mon Sep 3 11:30:14 2018 UTC (5 years, 9 months ago) by eric
Branch: MAIN
Changes since 1.199: +35 -4 lines
Diff to previous 1.199 (colored)

Update and document syntax for smarthost string in smtpd.conf:

- the +auth specifier is removed: it is implied by the presence of an
  auth label in the rest of the string
- secure:// is removed: use smtp+tls:// or smtps://
- tls:// is replaced by smtp+tls://
- smtp:// becomes SMTP with opportunistic STARTTLS
- smtp+tls:// becomes SMTP with mandatory STARTTLS

Adjust your config file accordingly.

ok gilles@

Revision 1.199 / (download) - annotate - [select for diffs], Sat Sep 1 19:56:28 2018 UTC (5 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.198: +4 -3 lines
Diff to previous 1.198 (colored)

clarify the forward-only delivery action

Revision 1.198 / (download) - annotate - [select for diffs], Thu Jul 5 14:56:26 2018 UTC (5 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.197: +11 -9 lines
Diff to previous 1.197 (colored)

further tweak the introductory text; ok gilles

Revision 1.197 / (download) - annotate - [select for diffs], Thu Jun 21 19:33:47 2018 UTC (5 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.196: +15 -14 lines
Diff to previous 1.196 (colored)

- various tweaks to try to make DESCRIPTION read better
- try to avoid muddling "reserved words" and "keywords"

ok gilles

Revision 1.196 / (download) - annotate - [select for diffs], Mon Jun 18 08:15:29 2018 UTC (5 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.195: +27 -16 lines
Diff to previous 1.195 (colored)

upfront, explain action/match, since it is central to how the new config works;
help/ok gilles

Revision 1.195 / (download) - annotate - [select for diffs], Fri Jun 15 08:57:17 2018 UTC (5 years, 11 months ago) by gilles
Branch: MAIN
Changes since 1.194: +6 -5 lines
Diff to previous 1.194 (colored)

the %{sender} variable should expand to the MAIL FROM address, so in the
case of a mailer daemon, this is an empty string, not '@'

introduce %{mbox.from} which is the From separator line representation
of a sender, usually an email address or MAILER-DAEMON if sender is empty

ok eric@

Revision 1.194 / (download) - annotate - [select for diffs], Wed Jun 13 13:30:31 2018 UTC (5 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.193: +65 -40 lines
Diff to previous 1.193 (colored)

various clarifications for the auth/ca/pki/cert stuff;
ok gilles, who obtains The Order Of Patience

Revision 1.193 / (download) - annotate - [select for diffs], Tue Jun 5 05:58:12 2018 UTC (6 years ago) by jmc
Branch: MAIN
Changes since 1.192: +8 -2 lines
Diff to previous 1.192 (colored)

document "match tag"; ok gilles

Revision 1.192 / (download) - annotate - [select for diffs], Mon Jun 4 21:13:34 2018 UTC (6 years ago) by jmc
Branch: MAIN
Changes since 1.191: +5 -1 lines
Diff to previous 1.191 (colored)

for "match", document that envelopes that do not match anything are rejected,
and that rules are evaluated sequentially, first match wins;

ok gilles

Revision 1.191 / (download) - annotate - [select for diffs], Mon Jun 4 16:34:09 2018 UTC (6 years ago) by jmc
Branch: MAIN
Changes since 1.190: +5 -5 lines
Diff to previous 1.190 (colored)

tweak previous;

Revision 1.190 / (download) - annotate - [select for diffs], Mon Jun 4 15:57:46 2018 UTC (6 years ago) by gilles
Branch: MAIN
Changes since 1.189: +12 -1 lines
Diff to previous 1.189 (colored)

add support for mda wrappers allowing postmaster to define command wrappers
that will be executed (with recipient privileges) before calling the users'
mail delivery agent

ok eric@

Revision 1.189 / (download) - annotate - [select for diffs], Mon Jun 4 12:15:10 2018 UTC (6 years ago) by jmc
Branch: MAIN
Changes since 1.188: +6 -6 lines
Diff to previous 1.188 (colored)

tweak the text of the relaying example: make it clear that the example
allows delivery as well as relaying (for authenticated users), and that
passing to an external mda is possible, but not required;

ok gilles

Revision 1.188 / (download) - annotate - [select for diffs], Mon Jun 4 11:52:40 2018 UTC (6 years ago) by jmc
Branch: MAIN
Changes since 1.187: +3 -3 lines
Diff to previous 1.187 (colored)

"match auth" matches transactions that *have been* authenticated;
ok gilles

Revision 1.187 / (download) - annotate - [select for diffs], Sat Jun 2 06:07:33 2018 UTC (6 years ago) by jmc
Branch: MAIN
Changes since 1.186: +2 -2 lines
Diff to previous 1.186 (colored)

restore one set of quotes i shouldn;t have removed;
from ingo feinerer

Revision 1.186 / (download) - annotate - [select for diffs], Fri Jun 1 19:42:24 2018 UTC (6 years ago) by gilles
Branch: MAIN
Changes since 1.185: +30 -30 lines
Diff to previous 1.185 (colored)

instead of using 'set queue XXX' 'set mta XXX' 'set mda XXX' to set option
XXX on the relevant component, just drop the keyword 'set', it does not do
anything useful and makes config directives longer.

while at it, instead of having 'limit' as a main keyword, make it an option
on components.

and also while at it, do cleanup parse.y a bit

ok millert@

Revision 1.185 / (download) - annotate - [select for diffs], Fri Jun 1 12:43:19 2018 UTC (6 years ago) by jmc
Branch: MAIN
Changes since 1.184: +23 -22 lines
Diff to previous 1.184 (colored)

document that keywords have to be quoted when used additionally as argument
names, and remove any unneccessary quoting from the existing examples;

ok gilles

Revision 1.184 / (download) - annotate - [select for diffs], Fri Jun 1 12:24:16 2018 UTC (6 years ago) by eric
Branch: MAIN
Changes since 1.183: +5 -2 lines
Diff to previous 1.183 (colored)

Require a valid certificate by default when relaying through a smarthost.
Add "tls no-verify" relay option to disable it.

suggested and initial diff by semarie@.

ok gilles@

Revision 1.183 / (download) - annotate - [select for diffs], Thu May 31 13:36:35 2018 UTC (6 years ago) by gilles
Branch: MAIN
Changes since 1.182: +15 -4 lines
Diff to previous 1.182 (colored)

- Replace virtual(5) reference by table(5) as virtual table format is
  documentation in table(5) man page under "Aliasing tables" section.

- Add "auth <table>" documentation. Example at end of the man page uses
  it, so it should be documented.

diff from Sebastien Marie

Revision 1.182 / (download) - annotate - [select for diffs], Wed May 30 13:44:03 2018 UTC (6 years ago) by jmc
Branch: MAIN
Changes since 1.181: +3 -3 lines
Diff to previous 1.181 (colored)

consistent casing;

Revision 1.181 / (download) - annotate - [select for diffs], Wed May 30 09:31:57 2018 UTC (6 years ago) by gilles
Branch: MAIN
Changes since 1.180: +7 -2 lines
Diff to previous 1.180 (colored)

teach mail.maildir how to junk mails if -j option is set and X-Spam is
positive, this can be enabled with the 'junk' option in maildir action

ok eric@

Revision 1.180 / (download) - annotate - [select for diffs], Tue May 29 22:16:15 2018 UTC (6 years ago) by gilles
Branch: MAIN
Changes since 1.179: +12 -2 lines
Diff to previous 1.179 (colored)

it turns out we can provide syntaxic sugar for an LMTP action in smtpd.conf
which should please our users ;-)

while at it get rid of unix:/inet: prefixes in LMTP destinations, we either
use an absolute path for a UNIX socket or it's necessarily a network socket
so '/' as the first char of the destination makes the prefixes irrelevant.

Revision 1.179 / (download) - annotate - [select for diffs], Tue May 29 11:43:22 2018 UTC (6 years ago) by gilles
Branch: MAIN
Changes since 1.178: +1 -7 lines
Diff to previous 1.178 (colored)

remove paragraph that's no longer true about authenticated users being
matched by from local

Revision 1.178 / (download) - annotate - [select for diffs], Fri May 25 14:41:57 2018 UTC (6 years ago) by millert
Branch: MAIN
Changes since 1.177: +4 -2 lines
Diff to previous 1.177 (colored)

Document that "from local" and "for local" are still the defaults.
OK gilles@

Revision 1.177 / (download) - annotate - [select for diffs], Fri May 25 09:17:01 2018 UTC (6 years ago) by gilles
Branch: MAIN
Changes since 1.176: +3 -2 lines
Diff to previous 1.176 (colored)

fix broken example

Revision 1.176 / (download) - annotate - [select for diffs], Thu May 24 12:40:38 2018 UTC (6 years ago) by schwarze
Branch: MAIN
Changes since 1.175: +105 -95 lines
Diff to previous 1.175 (colored)

basic macro cleanup

Revision 1.175 / (download) - annotate - [select for diffs], Thu May 24 11:38:24 2018 UTC (6 years ago) by gilles
Branch: MAIN
Changes since 1.174: +459 -833 lines
Diff to previous 1.174 (colored)

switch smtpd to new grammar

ok eric@

Revision 1.174 / (download) - annotate - [select for diffs], Tue Jul 11 06:08:40 2017 UTC (6 years, 11 months ago) by natano
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.173: +3 -5 lines
Diff to previous 1.173 (colored)

Remove "listen secure" syntax from smtpd.conf. It's broken since a couple of
months and noone complained.

Users should replace existing "listen secure" directives with two separate
"tls" and "smtps" listeners. i.e. a line like

        listen on $iface tls pki $pki

has to be replaced with

        listen on $iface tls pki $pki
        listen on $iface smtps pki $pki

Relaying syntax is not affected by this change.

suggested by eric
ok gilles

Revision 1.173 / (download) - annotate - [select for diffs], Wed Jun 7 13:25:18 2017 UTC (7 years ago) by jmc
Branch: MAIN
Changes since 1.172: +22 -29 lines
Diff to previous 1.172 (colored)

reword "listen on socket" somewhat; ok gilles

Revision 1.172 / (download) - annotate - [select for diffs], Sun May 28 11:17:33 2017 UTC (7 years ago) by jmc
Branch: MAIN
Changes since 1.171: +9 -1 lines
Diff to previous 1.171 (colored)

reinstate the description of "mask-source" to "listen on socket": my changes
two revisions previous inadvertently removed it;

ok gilles

Revision 1.171 / (download) - annotate - [select for diffs], Sun May 28 09:00:24 2017 UTC (7 years ago) by jmc
Branch: MAIN
Changes since 1.170: +6 -4 lines
Diff to previous 1.170 (colored)

mark up "masquerade";

Revision 1.170 / (download) - annotate - [select for diffs], Sun May 28 08:59:05 2017 UTC (7 years ago) by jmc
Branch: MAIN
Changes since 1.169: +23 -27 lines
Diff to previous 1.169 (colored)

split the two "listen on" directives into two separate items;
the markup that we were using wouldn;t have worked with groff anyway
but, more worringly, it didn;t work with mandoc either;

Revision 1.169 / (download) - annotate - [select for diffs], Wed May 24 13:26:03 2017 UTC (7 years ago) by jmc
Branch: MAIN
Changes since 1.168: +12 -5 lines
Diff to previous 1.168 (colored)

document that "for local" is the default; while here,
paste in the "table <aliases>" text;

ok gilles

Revision 1.168 / (download) - annotate - [select for diffs], Mon Feb 13 12:23:47 2017 UTC (7 years, 3 months ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.167: +6 -3 lines
Diff to previous 1.167 (colored)

allow negation of authenticated keyword:
	accept ! authenticated [...]

ok sunil@, jung@

Revision 1.167 / (download) - annotate - [select for diffs], Sun Jan 8 01:38:31 2017 UTC (7 years, 5 months ago) by schwarze
Branch: MAIN
Changes since 1.166: +2 -5 lines
Diff to previous 1.166 (colored)

delete three macro lines that have no effect, found with mandoc -Tlint

Revision 1.166 / (download) - annotate - [select for diffs], Sun Sep 11 10:56:45 2016 UTC (7 years, 8 months ago) by gilles
Branch: MAIN
Changes since 1.165: +1 -23 lines
Diff to previous 1.165 (colored)

remove documentation for filters, we'll document when it's ready

Revision 1.165 / (download) - annotate - [select for diffs], Wed Aug 31 16:39:24 2016 UTC (7 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.164: +3 -5 lines
Diff to previous 1.164 (colored)

no need for Xo/Xc here, plus minor tweak;

Revision 1.164 / (download) - annotate - [select for diffs], Wed Aug 31 15:24:04 2016 UTC (7 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.163: +11 -2 lines
Diff to previous 1.163 (colored)

introduce "authenticated" parameter so rules may apply to authenticated
sessions specifically

ok eric@, sunil@, jung@

Revision 1.163 / (download) - annotate - [select for diffs], Wed Aug 31 13:55:32 2016 UTC (7 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.162: +3 -3 lines
Diff to previous 1.162 (colored)

word fix;

Revision 1.162 / (download) - annotate - [select for diffs], Wed Aug 31 10:18:08 2016 UTC (7 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.161: +15 -2 lines
Diff to previous 1.161 (colored)

allow overriding the subaddressing delimiter with subaddressing-delimiter
keyword, the default is still +

ok eric@, sunil@

Revision 1.161 / (download) - annotate - [select for diffs], Thu May 19 08:21:23 2016 UTC (8 years ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.160: +4 -4 lines
Diff to previous 1.160 (colored)

table formats are described in table(5) not makemap(8)

Revision 1.160 / (download) - annotate - [select for diffs], Wed May 11 18:34:44 2016 UTC (8 years ago) by jung
Branch: MAIN
Changes since 1.159: +6 -2 lines
Diff to previous 1.159 (colored)

mention ca option in listen directive

same spelling fix from jmc and gilles

ok gilles

Revision 1.159 / (download) - annotate - [select for diffs], Tue May 3 18:43:45 2016 UTC (8 years, 1 month ago) by jung
Branch: MAIN
Changes since 1.158: +12 -10 lines
Diff to previous 1.158 (colored)

listen directive may use a table for authentication, to make this work the
table has to be defined BEFORE
consequently move all tables in the examples to the beginning and before the
listen directive to avoid tables not being found

no functional change

ran into this myself earlier, also reported by cjones via irc

ok gilles

Revision 1.158 / (download) - annotate - [select for diffs], Thu Apr 21 14:27:41 2016 UTC (8 years, 1 month ago) by jsing
Branch: MAIN
Changes since 1.157: +8 -14 lines
Diff to previous 1.157 (colored)

Use automatic DH parameters, instead of fixed ones. Also disable DHE by
default since it is computationally expensive and a potential DoS vector.

ok gilles@

Revision 1.157 / (download) - annotate - [select for diffs], Sun Apr 10 06:48:07 2016 UTC (8 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.156: +3 -3 lines
Diff to previous 1.156 (colored)

arguments to "chain" are space separated, not comma; verified by jung
diff from david+bsd

i also removed Op, since ... is enough/

Revision 1.156 / (download) - annotate - [select for diffs], Mon Mar 7 16:21:48 2016 UTC (8 years, 3 months ago) by gilles
Branch: MAIN
Changes since 1.155: +2 -2 lines
Diff to previous 1.155 (colored)

fix error in documentation of `ca' keyword

From: Sevan Janiyan <venture37@geeklan.co.uk>

Revision 1.155 / (download) - annotate - [select for diffs], Sat Feb 13 23:15:00 2016 UTC (8 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.154: +4 -6 lines
Diff to previous 1.154 (colored)

tweak previous;

Revision 1.154 / (download) - annotate - [select for diffs], Sat Feb 13 20:56:39 2016 UTC (8 years, 3 months ago) by gilles
Branch: MAIN
Changes since 1.153: +32 -6 lines
Diff to previous 1.153 (colored)

describe how 'listen on socket' works

original diff from Peter Bisroev <peter@int19h.net>
rewording from me, linebreaks from jung@

Revision 1.153 / (download) - annotate - [select for diffs], Thu Jan 21 23:40:27 2016 UTC (8 years, 4 months ago) by jung
Branch: MAIN
Changes since 1.152: +7 -7 lines
Diff to previous 1.152 (colored)

another round of tiny wording tweaks and unifications

all from tj

ok millert

Revision 1.152 / (download) - annotate - [select for diffs], Tue Jan 19 22:41:51 2016 UTC (8 years, 4 months ago) by jung
Branch: MAIN
Changes since 1.151: +5 -5 lines
Diff to previous 1.151 (colored)

minor tweaks: remove comma, remove superflous plural s, add the word "file"
after ~/.forward, and change builtin to built-in

from tj

ok millert@

Revision 1.151 / (download) - annotate - [select for diffs], Mon Jan 18 22:08:28 2016 UTC (8 years, 4 months ago) by jung
Branch: MAIN
Changes since 1.150: +7 -6 lines
Diff to previous 1.150 (colored)

minor tweaks: add single quote to @ char, add .Ic markup to forward-only,
fix end of list marker, and add an 'are'

ok millert (to an earlier version without end of list fix and without 'are')

Revision 1.150 / (download) - annotate - [select for diffs], Mon Jan 18 08:58:10 2016 UTC (8 years, 4 months ago) by jung
Branch: MAIN
Changes since 1.149: +24 -16 lines
Diff to previous 1.149 (colored)

unify and add some more smtpd(8) references

ok sunil gilles eric

Revision 1.149 / (download) - annotate - [select for diffs], Sun Jan 3 17:07:36 2016 UTC (8 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.148: +8 -8 lines
Diff to previous 1.148 (colored)

fix wording which becomes confusing now that filters is a real thing
diff from Marcus MERIGHI <mcmer-openbsd@tor.at>

ok jmc@

while at it, fixed an example

Revision 1.148 / (download) - annotate - [select for diffs], Tue Dec 22 20:59:14 2015 UTC (8 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.147: +6 -7 lines
Diff to previous 1.147 (colored)

update examples
diff from Serguey Parkhomovsky <sergueyparkhomovsky@gmail.com>

ok sunil@

Revision 1.147 / (download) - annotate - [select for diffs], Tue Dec 15 23:16:13 2015 UTC (8 years, 5 months ago) by jung
Branch: MAIN
Changes since 1.146: +2 -5 lines
Diff to previous 1.146 (colored)

less macro and lines

ok millert

Revision 1.146 / (download) - annotate - [select for diffs], Sun Dec 13 11:28:12 2015 UTC (8 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.145: +4 -8 lines
Diff to previous 1.145 (colored)

less macro;

Revision 1.145 / (download) - annotate - [select for diffs], Sun Dec 13 10:56:26 2015 UTC (8 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.144: +27 -2 lines
Diff to previous 1.144 (colored)

document filter keyword

Revision 1.144 / (download) - annotate - [select for diffs], Sun Dec 13 10:28:41 2015 UTC (8 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.143: +6 -1 lines
Diff to previous 1.143 (colored)

document wildcard pki/ca

Revision 1.143 / (download) - annotate - [select for diffs], Sat Dec 12 21:13:39 2015 UTC (8 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.142: +5 -6 lines
Diff to previous 1.142 (colored)

tweaks;

Revision 1.142 / (download) - annotate - [select for diffs], Sat Dec 12 20:02:31 2015 UTC (8 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.141: +6 -6 lines
Diff to previous 1.141 (colored)

remove CA from pki and no longer allow specifying a CA with 'pki' keyword.
introduce 'ca' keyword to allow specifying a custom CA.
making CA part of pki was a bad idea and several people hit use-cases that
plain couldn't work.

instead of:
    pki foobar.org ca "/etc/mail/CA.pem"

use now:
    ca foobar.org certificate "/etc/mail/CA.pem"


ok sunil@, jung@

Revision 1.141 / (download) - annotate - [select for diffs], Sat Dec 12 18:49:38 2015 UTC (8 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.140: +4 -2 lines
Diff to previous 1.140 (colored)

when using senders map to restrict email address a user may use in SMTP
dialogue, if `masquerade' is used as a parameter then rewrite the email
address of the DATA From header to the email address in the map.

Revision 1.140 / (download) - annotate - [select for diffs], Sat Dec 12 17:16:56 2015 UTC (8 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.139: +9 -1 lines
Diff to previous 1.139 (colored)

allow overriding the default cipher-suite

ok jung@, sunil@, millert@

Revision 1.139 / (download) - annotate - [select for diffs], Sat Dec 12 11:54:42 2015 UTC (8 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.138: +5 -4 lines
Diff to previous 1.138 (colored)

tweak previous;

Revision 1.138 / (download) - annotate - [select for diffs], Sat Dec 12 11:31:29 2015 UTC (8 years, 5 months ago) by sunil
Branch: MAIN
Changes since 1.137: +10 -2 lines
Diff to previous 1.137 (colored)

Implement senders map.

senders table allows to restrict the addresses that an authenticated
user can use in the SMTP dialogue.

Ok gilles@

Revision 1.137 / (download) - annotate - [select for diffs], Wed Dec 9 12:07:11 2015 UTC (8 years, 6 months ago) by sunil
Branch: MAIN
Changes since 1.136: +13 -1 lines
Diff to previous 1.136 (colored)

Document forward-only keyword. From Jason Barbier <jabarb@serversave.us>

Ok gilles@ jung@

Revision 1.136 / (download) - annotate - [select for diffs], Thu Dec 3 22:15:54 2015 UTC (8 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.135: +4 -2 lines
Diff to previous 1.135 (colored)


new sentence, new line;

Revision 1.135 / (download) - annotate - [select for diffs], Thu Dec 3 21:13:53 2015 UTC (8 years, 6 months ago) by jung
Branch: MAIN
Changes since 1.134: +6 -6 lines
Diff to previous 1.134 (colored)

remove trailing whitespace

Revision 1.134 / (download) - annotate - [select for diffs], Thu Dec 3 21:11:33 2015 UTC (8 years, 6 months ago) by jung
Branch: MAIN
Changes since 1.133: +12 -1 lines
Diff to previous 1.133 (colored)

introduce limit session keyword replacing fixed values

original diff from Renaud Allard

ok gilles

Revision 1.133 / (download) - annotate - [select for diffs], Tue Dec 1 22:30:00 2015 UTC (8 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.132: +4 -4 lines
Diff to previous 1.132 (colored)

missing articles in previous;

Revision 1.132 / (download) - annotate - [select for diffs], Tue Dec 1 18:22:30 2015 UTC (8 years, 6 months ago) by gilles
Branch: MAIN
Changes since 1.131: +9 -2 lines
Diff to previous 1.131 (colored)

add received-auth parameter to listener to identify authenticated sessions
in locally appended Received header when enabled

ok millert@, jung@

Revision 1.131 / (download) - annotate - [select for diffs], Mon Nov 30 12:26:55 2015 UTC (8 years, 6 months ago) by sunil
Branch: MAIN
Changes since 1.130: +9 -5 lines
Diff to previous 1.130 (colored)

While delivering to lmtp or mda, accept optional "as user" parameter
whose privileges would be used instead of the default.

Ok gilles@ jung@

Revision 1.130 / (download) - annotate - [select for diffs], Tue Oct 27 21:20:11 2015 UTC (8 years, 7 months ago) by jung
Branch: MAIN
Changes since 1.129: +12 -3 lines
Diff to previous 1.129 (colored)

add a rcpt-to parameter to be able to use the original (probably expanded)
RCPT TO within LMTP sessions

ok gilles eric

Revision 1.129 / (download) - annotate - [select for diffs], Thu Sep 3 12:23:23 2015 UTC (8 years, 9 months ago) by millert
Branch: MAIN
Changes since 1.128: +3 -3 lines
Diff to previous 1.128 (colored)

Document spool dir in smtpd's FILES section and be consistent with
using compact lists for FILES in the other manual pages.  OK gilles@

Revision 1.128 / (download) - annotate - [select for diffs], Sat Aug 15 16:09:25 2015 UTC (8 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.127: +3 -3 lines
Diff to previous 1.127 (colored)

change "priorly" to "previously", it reads better

Revision 1.127 / (download) - annotate - [select for diffs], Tue Aug 11 21:57:24 2015 UTC (8 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.126: +6 -7 lines
Diff to previous 1.126 (colored)

tls and verify are not mutually exclusive;
pointed out by l?vai d?niel and david dahlberg

ok gilles

Revision 1.126 / (download) - annotate - [select for diffs], Thu Jun 4 14:23:00 2015 UTC (9 years ago) by sobrado
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.125: +6 -6 lines
Diff to previous 1.125 (colored)

spacing, makes example fit on display.

no objection from gilles@

Revision 1.125 / (download) - annotate - [select for diffs], Fri Mar 6 17:36:47 2015 UTC (9 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.124: +26 -3 lines
Diff to previous 1.124 (colored)

Document how to use anti-spoofing rules to reject spam.
OK deraadt@ gilles@ phessler@

Revision 1.124 / (download) - annotate - [select for diffs], Mon Mar 2 20:20:17 2015 UTC (9 years, 3 months ago) by bentley
Branch: MAIN
Changes since 1.123: +78 -66 lines
Diff to previous 1.123 (colored)

Cleanup smtpd.conf(5).

 - use literal <> around smtpd tables instead of Aq
 - mark up some directives as Ic (previously Ar or unmarked)
 - use Dq/Sq instead of " in a few appropriate places
 - use Bl -column instead of Bd -literal for tables

ok schwarze@

Revision 1.123 / (download) - annotate - [select for diffs], Sat Dec 13 13:36:03 2014 UTC (9 years, 5 months ago) by millert
Branch: MAIN
Changes since 1.122: +18 -2 lines
Diff to previous 1.122 (colored)

Add DKIM signing example based on eric@'s asiabsdcon slides
OK gilles@ jmc@

Revision 1.122 / (download) - annotate - [select for diffs], Wed Nov 19 04:05:44 2014 UTC (9 years, 6 months ago) by schwarze
Branch: MAIN
Changes since 1.121: +4 -4 lines
Diff to previous 1.121 (colored)

two obvious markup fixes; from frankgroeneveld dot nl

Revision 1.121 / (download) - annotate - [select for diffs], Wed Jul 9 12:44:54 2014 UTC (9 years, 11 months ago) by eric
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.120: +8 -2 lines
Diff to previous 1.120 (colored)

add a "no-dsn" listener option to disable DSN extension.

Revision 1.120 / (download) - annotate - [select for diffs], Tue Jul 8 07:59:31 2014 UTC (9 years, 11 months ago) by sobrado
Branch: MAIN
Changes since 1.119: +3 -3 lines
Diff to previous 1.119 (colored)

fix typos.

ok jmc@

Revision 1.119 / (download) - annotate - [select for diffs], Sat Jun 7 07:53:32 2014 UTC (10 years ago) by jmc
Branch: MAIN
Changes since 1.118: +3 -3 lines
Diff to previous 1.118 (colored)

Clint Pachl points out "authtable" is optional;

Revision 1.118 / (download) - annotate - [select for diffs], Thu May 15 19:36:45 2014 UTC (10 years ago) by jmc
Branch: MAIN
Changes since 1.117: +18 -15 lines
Diff to previous 1.117 (colored)

use <> for tables;
original report from creamy;
diff from Frank Brodbeck, tweaked

Revision 1.117 / (download) - annotate - [select for diffs], Sun Feb 16 21:59:34 2014 UTC (10 years, 3 months ago) by schwarze
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.116: +36 -15 lines
Diff to previous 1.116 (colored)

1) Fix the markup of the time specifications,
which is quite tricky (discussed with jmc@).
2) Also fix the display of literal exclamation marks: Do not
use \! - in roff(7), that's an arcane thing called the "transparent
line indicator", which doesn't render as '!' with groff,
and which isn't implemented at all in mandoc.

Revision 1.116 / (download) - annotate - [select for diffs], Tue Feb 4 16:32:36 2014 UTC (10 years, 4 months ago) by eric
Branch: MAIN
Changes since 1.115: +13 -13 lines
Diff to previous 1.115 (colored)

update documentation

Revision 1.115 / (download) - annotate - [select for diffs], Fri Dec 13 21:48:28 2013 UTC (10 years, 5 months ago) by jca
Branch: MAIN
Changes since 1.114: +3 -3 lines
Diff to previous 1.114 (colored)

Give format specifiers their own subsection, so that we can reference it
from other places.  ok brett@ jmc@ gilles@

Revision 1.114 / (download) - annotate - [select for diffs], Fri Dec 13 21:45:27 2013 UTC (10 years, 5 months ago) by jca
Branch: MAIN
Changes since 1.113: +3 -3 lines
Diff to previous 1.113 (colored)

Use \(dq instead of \&" to print a double quote on a macro line.
Documented by mandoc_char(7), and plays nicer with syntax hilighting
editors.  ok brett@ jmc@ gilles@

Revision 1.113 / (download) - annotate - [select for diffs], Fri Dec 6 10:42:15 2013 UTC (10 years, 6 months ago) by eric
Branch: MAIN
Changes since 1.112: +1 -8 lines
Diff to previous 1.112 (colored)

"verify" is already documented with "tls-require verify".

Revision 1.112 / (download) - annotate - [select for diffs], Thu Dec 5 10:27:30 2013 UTC (10 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.111: +7 -7 lines
Diff to previous 1.111 (colored)

minor tweaks;

Revision 1.111 / (download) - annotate - [select for diffs], Thu Dec 5 09:31:16 2013 UTC (10 years, 6 months ago) by eric
Branch: MAIN
Changes since 1.110: +24 -2 lines
Diff to previous 1.110 (colored)

document "verify" keyword and "authtable" option on "listen" rules

Revision 1.110 / (download) - annotate - [select for diffs], Tue Nov 19 10:22:42 2013 UTC (10 years, 6 months ago) by eric
Branch: MAIN
Changes since 1.109: +9 -0 lines
Diff to previous 1.109 (colored)

Allow '*' in the user part of mailaddresses.  By default, potentially dangerous
characters are replaced when expanding for local deliveries, unless the "raw"
modifier is specified.

Revision 1.109 / (download) - annotate - [select for diffs], Tue Nov 19 10:01:20 2013 UTC (10 years, 6 months ago) by eric
Branch: MAIN
Changes since 1.108: +8 -0 lines
Diff to previous 1.108 (colored)

Add a limit on the number of inflight envelopes.  The scheduler suspends
scheduling of mta/mda envelopes until the number of inflight envelopes
falls below that line.

Revision 1.108 / (download) - annotate - [select for diffs], Mon Nov 18 12:24:26 2013 UTC (10 years, 6 months ago) by eric
Branch: MAIN
Changes since 1.107: +5 -0 lines
Diff to previous 1.107 (colored)

Allow overriding the local ca

Revision 1.107 / (download) - annotate - [select for diffs], Wed Nov 6 10:01:29 2013 UTC (10 years, 7 months ago) by eric
Branch: MAIN
Changes since 1.106: +245 -73 lines
Diff to previous 1.106 (colored)

Much much improved config parser and related changes.
Simplify code and do not impose an order on conditions and rule options.

Format changes that may require smtpd.conf update for some setups:

- SSL certificates are no longer automatically loaded, but must be
  explicitely declared using the "pki" keyword.
- "certificate" option becomes "pki" in listener and accept rules.
- "ssl://" becomes "secure://" in relay via rules.
- "helo" becomes "hostnames" in relay rules

New features:

- accept rules do not need an explicit action, in which case alias table
  or .forward must provide one.
- new "forward-only" action to force relaying and reject rcpts that expand
  as local delivery.
- "!" (negation) modifier on rule matching conditions.
- new "recipient" rule matching condition.
- new "verify" option on listeners and relay rules to reject invalid
  certificates.

Other changes:

- remember the helo name advertised on incoming mail and use it for sending
  bounces.
- bump envelope version (existing envelopes are updated on-the-fly).

Revision 1.106 / (download) - annotate - [select for diffs], Tue Oct 29 14:30:05 2013 UTC (10 years, 7 months ago) by eric
Branch: MAIN
Changes since 1.105: +4 -4 lines
Diff to previous 1.105 (colored)

use "/etc/mail/mailname" instead of "/etc/mailname" and make it a define.

Revision 1.105 / (download) - annotate - [select for diffs], Thu Aug 8 07:08:34 2013 UTC (10 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.104: +44 -44 lines
Diff to previous 1.104 (colored)

move the parameter expansion text to after the config options text,
to avoid overwhelming the reader;

ok gilles

Revision 1.104 / (download) - annotate - [select for diffs], Mon Aug 5 07:01:45 2013 UTC (10 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.103: +21 -24 lines
Diff to previous 1.103 (colored)

better document /etc/mailname;
ok gilles

Revision 1.103 / (download) - annotate - [select for diffs], Sat Jul 20 06:49:17 2013 UTC (10 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4
Changes since 1.102: +5 -7 lines
Diff to previous 1.102 (colored)

tweak previous;

Revision 1.102 / (download) - annotate - [select for diffs], Fri Jul 19 21:14:52 2013 UTC (10 years, 10 months ago) by eric
Branch: MAIN
Changes since 1.101: +24 -4 lines
Diff to previous 1.101 (colored)

Many MTA improvements:

- Better transient error handling logic: failing destinations are
  automatically disabled for a while.  When a destination is active
  again, ask the scheduler to retry previous envelopes immediatly.
- More informative error report when all routes fail for a mail.
- Implement a "smtpctl show hoststats" command to get the latest stat
  message per MX domain.
- Implement a "smtpctl show routes" command to show the state the
  currently known routes to remote MXs.
- Implement a "smtpctl resume route" command to re-enable a route that
  has been disabled.
- Do not hardcode limits
- Minor code improvements

Revision 1.101 / (download) - annotate - [select for diffs], Fri Jul 19 20:37:07 2013 UTC (10 years, 10 months ago) by eric
Branch: MAIN
Changes since 1.100: +19 -1 lines
Diff to previous 1.100 (colored)

Assorted queue improvements:
- cleanup the internal queue backend API and get rid of the QOP_* thing.
- implement a queue_proc backend
- rename queue_fsqueue.c to queue_fs
- enable support for queue encryption
- add an envelope cache
- better logging and error reporting

Revision 1.100 / (download) - annotate - [select for diffs], Fri Jul 19 19:10:22 2013 UTC (10 years, 10 months ago) by eric
Branch: MAIN
Changes since 1.99: +9 -1 lines
Diff to previous 1.99 (colored)

Allow to specify an address family on a listener

Revision 1.99 / (download) - annotate - [select for diffs], Fri Jul 19 13:11:18 2013 UTC (10 years, 10 months ago) by eric
Branch: MAIN
Changes since 1.98: +30 -12 lines
Diff to previous 1.98 (colored)

Improve and document the way the default server name is found.

Revision 1.98 / (download) - annotate - [select for diffs], Fri Jul 19 08:12:19 2013 UTC (10 years, 10 months ago) by eric
Branch: MAIN
Changes since 1.97: +11 -2 lines
Diff to previous 1.97 (colored)

Introduce expand string modifiers

Revision 1.97 / (download) - annotate - [select for diffs], Wed Jun 26 07:22:20 2013 UTC (10 years, 11 months ago) by gilles
Branch: MAIN
Changes since 1.96: +2 -2 lines
Diff to previous 1.96 (colored)

paragraph still mentions an interface name when the example below no longer
does, reported by Tyler Morgan and Scott Vanderbilt

ok jmc@

Revision 1.96 / (download) - annotate - [select for diffs], Sun Jun 9 08:26:35 2013 UTC (11 years ago) by jmc
Branch: MAIN
Changes since 1.95: +3 -3 lines
Diff to previous 1.95 (colored)

oops! one more instance of previous...

Revision 1.95 / (download) - annotate - [select for diffs], Sun Jun 9 08:22:50 2013 UTC (11 years ago) by jmc
Branch: MAIN
Changes since 1.94: +2 -2 lines
Diff to previous 1.94 (colored)

the argument name for "source" is "source", not "table";
from MrD

Revision 1.94 / (download) - annotate - [select for diffs], Fri May 24 17:50:22 2013 UTC (11 years ago) by jmc
Branch: MAIN
Changes since 1.93: +8 -7 lines
Diff to previous 1.93 (colored)

tweak the "deliver to lmtp" text, and zap an extraneous space;

Revision 1.93 / (download) - annotate - [select for diffs], Fri May 24 17:03:14 2013 UTC (11 years ago) by eric
Branch: MAIN
Changes since 1.92: +15 -1 lines
Diff to previous 1.92 (colored)

sync with OpenSMTPD 5.3.2

ok gilles@

Revision 1.92 / (download) - annotate - [select for diffs], Sun Feb 17 17:45:01 2013 UTC (11 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_3_BASE, OPENBSD_5_3
Changes since 1.91: +4 -4 lines
Diff to previous 1.91 (colored)

zap the surrounding whitespace and mark up for "=";
ok gilles

Revision 1.91 / (download) - annotate - [select for diffs], Sun Feb 17 12:28:30 2013 UTC (11 years, 3 months ago) by gilles
Branch: MAIN
Changes since 1.90: +2 -8 lines
Diff to previous 1.90 (colored)

disable queue compression temporarily, we lack the smtpctl bits

Revision 1.90 / (download) - annotate - [select for diffs], Fri Feb 15 22:43:21 2013 UTC (11 years, 3 months ago) by eric
Branch: MAIN
Changes since 1.89: +3 -1 lines
Diff to previous 1.89 (colored)

add missing bits for lmtp support (from Ashish SHUKLA).

ok gilles@

Revision 1.89 / (download) - annotate - [select for diffs], Thu Feb 14 12:32:19 2013 UTC (11 years, 3 months ago) by gilles
Branch: MAIN
Changes since 1.88: +3 -3 lines
Diff to previous 1.88 (colored)

- change => to = in documentation

Revision 1.88 / (download) - annotate - [select for diffs], Thu Feb 14 12:30:49 2013 UTC (11 years, 3 months ago) by gilles
Branch: MAIN
Changes since 1.87: +3 -3 lines
Diff to previous 1.87 (colored)

- smtpctl trace expand, enables tracing of aliases expansion
- replace "users" keyword with "userbase" when providing alternate userbase
- disambiguise expansion nodes when expanding across domains and userbases
- allow use of '=' instead of '=>' when declaring a mapping

ok eric@

Revision 1.87 / (download) - annotate - [select for diffs], Thu Feb 14 07:42:49 2013 UTC (11 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.86: +3 -13 lines
Diff to previous 1.86 (colored)

simplify markup for the "table" keyword; ok gilles

Revision 1.86 / (download) - annotate - [select for diffs], Sun Feb 10 15:45:46 2013 UTC (11 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.85: +11 -37 lines
Diff to previous 1.85 (colored)

remove some unneeded Xo/Xc.

Revision 1.85 / (download) - annotate - [select for diffs], Sun Feb 10 15:23:13 2013 UTC (11 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.84: +17 -19 lines
Diff to previous 1.84 (colored)

do not mark up punctuation; ok gilles

Revision 1.84 / (download) - annotate - [select for diffs], Fri Feb 8 10:13:55 2013 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.83: +8 -4 lines
Diff to previous 1.83 (colored)

the per-rule "expire" does not really fit in its current section,
so move it into its own little bit;

ok gilles

Revision 1.83 / (download) - annotate - [select for diffs], Fri Feb 8 08:41:10 2013 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.82: +184 -184 lines
Diff to previous 1.82 (colored)

order the syntax alphabetically; ok gilles

Revision 1.82 / (download) - annotate - [select for diffs], Wed Feb 6 07:30:02 2013 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.81: +7 -4 lines
Diff to previous 1.81 (colored)

- for "listen on", use "keeps" to avoid bad formatting
- avoid line wrap in examples
- put "expire" back into the accept/reject block

ok gilles

Revision 1.81 / (download) - annotate - [select for diffs], Tue Feb 5 09:49:38 2013 UTC (11 years, 4 months ago) by gilles
Branch: MAIN
Changes since 1.80: +23 -0 lines
Diff to previous 1.80 (colored)

commit documentation for "helo" in relay rules

Revision 1.80 / (download) - annotate - [select for diffs], Mon Feb 4 05:55:58 2013 UTC (11 years, 4 months ago) by gilles
Branch: MAIN
Changes since 1.79: +3 -3 lines
Diff to previous 1.79 (colored)

fix authenticated relaying example

Revision 1.79 / (download) - annotate - [select for diffs], Sat Jan 26 17:02:52 2013 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.78: +2 -2 lines
Diff to previous 1.78 (colored)

pesky quote!

Revision 1.78 / (download) - annotate - [select for diffs], Sat Jan 26 14:13:25 2013 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.77: +15 -13 lines
Diff to previous 1.77 (colored)

tweak previous;

Revision 1.77 / (download) - annotate - [select for diffs], Sat Jan 26 09:37:23 2013 UTC (11 years, 4 months ago) by gilles
Branch: MAIN
Changes since 1.76: +234 -65 lines
Diff to previous 1.76 (colored)

Sync with our smtpd repo:

* first bricks of ldap and sqlite support (not finished but both working)
* new table API to replace map API, all lookups are done through tables
* improved handling of temporary errors throughout the daemon
* improved scheduler and mta logic: connection reuse, optimizes batches
* improved queue: more tolerant to admin errors, new layout, less disk-IO
* improved memory usage under high load
* SSL certs/keys isolated to lookup process to avoid facing network
* VIRTUAL support improved, fully virtual setups possible now
* runtime tracing of processes through smtpctl trace
* ssl_privsep.c sync-ed with relayd
* ssl.c no longer contains smtpd specific interfaces
* smtpd-specific ssl bits moved to ssl_smtpd.c
* update mail address in copyright

FLUSH YOUR QUEUE. FLUSH YOUR QUEUE. FLUSH YOUR QUEUE. FLUSH YOUR QUEUE.

smtpd.conf(5) simplified, it will require adaptations

ok eric@

Revision 1.76 / (download) - annotate - [select for diffs], Tue Oct 16 16:47:40 2012 UTC (11 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.75: +3 -3 lines
Diff to previous 1.75 (colored)

consistent macros; Tim van der Molen

Revision 1.75 / (download) - annotate - [select for diffs], Sun Oct 14 12:05:14 2012 UTC (11 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.74: +3 -3 lines
Diff to previous 1.74 (colored)

replace 'plain' with 'file' as the backend source name for map_file.c

Revision 1.74 / (download) - annotate - [select for diffs], Thu Oct 11 21:14:32 2012 UTC (11 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.73: +7 -7 lines
Diff to previous 1.73 (colored)

- replace "from all" and "for all" with "from any" and "for any"

ok eric@, chl@

Revision 1.73 / (download) - annotate - [select for diffs], Wed Oct 10 06:02:26 2012 UTC (11 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.72: +4 -4 lines
Diff to previous 1.72 (colored)

a SMTP -> an SMTP;

Revision 1.72 / (download) - annotate - [select for diffs], Tue Oct 9 20:33:02 2012 UTC (11 years, 8 months ago) by gilles
Branch: MAIN
Changes since 1.71: +21 -8 lines
Diff to previous 1.71 (colored)

- allow a listen statement to impose tls on its clients;
- make listen statements impose authentication if 'auth' is specified and
	to make it optional if 'auth-optional' is specified;
- sync documentation accordingly

with ideas and input from beck@ and halex@, ok eric@

Revision 1.71 / (download) - annotate - [select for diffs], Tue Oct 9 18:28:09 2012 UTC (11 years, 8 months ago) by gilles
Branch: MAIN
Changes since 1.70: +6 -6 lines
Diff to previous 1.70 (colored)

fix listen examples to not use an interface

Revision 1.70 / (download) - annotate - [select for diffs], Mon Oct 8 20:35:16 2012 UTC (11 years, 8 months ago) by gilles
Branch: MAIN
Changes since 1.69: +2 -1 lines
Diff to previous 1.69 (colored)

disk space is cheap but we still want to limit the default size of a body
to a sane default for everyone.

Revision 1.69 / (download) - annotate - [select for diffs], Fri Oct 5 07:00:47 2012 UTC (11 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.68: +7 -5 lines
Diff to previous 1.68 (colored)

further tweak the maps description; ok gilles

Revision 1.68 / (download) - annotate - [select for diffs], Fri Oct 5 06:25:56 2012 UTC (11 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.67: +3 -6 lines
Diff to previous 1.67 (colored)

tweak previous; ok gilles

Revision 1.67 / (download) - annotate - [select for diffs], Thu Oct 4 19:49:53 2012 UTC (11 years, 8 months ago) by gilles
Branch: MAIN
Changes since 1.66: +6 -2 lines
Diff to previous 1.66 (colored)

default map source to S_PLAIN, this allows us to simplify smtpd.conf:
	map aliases source plain "/etc/mail/aliases"
can be reduced to:
	map aliases "/etc/mail/aliases"

Revision 1.66 / (download) - annotate - [select for diffs], Mon Sep 17 18:44:57 2012 UTC (11 years, 8 months ago) by gilles
Branch: MAIN
Changes since 1.65: +3 -3 lines
Diff to previous 1.65 (colored)

Fix format expansion in smtpd.conf, it has confused a lot of people and it
turns out documentation got it wrong. This commit changes formats and doc,
it makes situation saner:

   %A = user part of sender address
   %D = domain part of sender address

   %a = user part of recipient address
   %d = domain part of recipient address
   %u = unix account of recipient

ok eric@

Revision 1.65 / (download) - annotate - [select for diffs], Sat Sep 1 16:09:14 2012 UTC (11 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.64: +1 -31 lines
Diff to previous 1.64 (colored)

- remove crypto_backend
- remove support for encrypted queue, it will be reintroduced later after
  pouring more thinking into it

if you had it enabled, flush your queue before updating

Revision 1.64 / (download) - annotate - [select for diffs], Wed Aug 29 18:36:24 2012 UTC (11 years, 9 months ago) by naddy
Branch: MAIN
Changes since 1.63: +2 -2 lines
Diff to previous 1.63 (colored)

switch the default queue encryption to AES-128
I'm committing this on behalf of gilles@

Revision 1.63 / (download) - annotate - [select for diffs], Wed Aug 29 18:10:28 2012 UTC (11 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.62: +8 -8 lines
Diff to previous 1.62 (colored)

tweak previous;

Revision 1.62 / (download) - annotate - [select for diffs], Wed Aug 29 16:48:40 2012 UTC (11 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.61: +7 -2 lines
Diff to previous 1.61 (colored)

obvious, but document that change of any encryption parameter *requires*
queue to be emptied first.

Revision 1.61 / (download) - annotate - [select for diffs], Wed Aug 29 16:26:17 2012 UTC (11 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.60: +34 -4 lines
Diff to previous 1.60 (colored)

Introduce the crypto_backend API and provide support for... encrypted queue
using the new API. By default, OpenSMTPD does not provide queue encryption,
but it can be enabled with "queue encryption [args]" and will transparently
encrypt/decrypt envelopes/messages as they hit the queue.

By default, it will use Blowfish in CBC mode with a different random IV for
each envelope and message. User provided key is expanded using sha256 but a
different cipher and digest may be specified in smtpd.conf

Queue encryption is compatible with compression and if both options are set
it will do them in correct order and transparently.

tested by chl@, a few users and myself
ok chl@ and I

Revision 1.60 / (download) - annotate - [select for diffs], Sun Aug 26 13:55:47 2012 UTC (11 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.59: +5 -1 lines
Diff to previous 1.59 (colored)

- document queue compression

Revision 1.59 / (download) - annotate - [select for diffs], Tue Aug 21 22:22:00 2012 UTC (11 years, 9 months ago) by jmc
Branch: MAIN
Changes since 1.58: +5 -5 lines
Diff to previous 1.58 (colored)

tweak previous;

Revision 1.58 / (download) - annotate - [select for diffs], Tue Aug 21 20:19:46 2012 UTC (11 years, 9 months ago) by eric
Branch: MAIN
Changes since 1.57: +10 -1 lines
Diff to previous 1.57 (colored)

Allow smtpd to work as a backup MX, relaying only to MXs with higher
priority in the DNS record. For example:

   accept for domain "foo.org" relay backup "mx3.foo.org"

will relay mails for "foo.org" using only hosts with higher priority
(i.e. lower value) than "mx3.foo.org", which is supposed to be the
current server.

If the specified backup MX is not found in the DNS record, relaying
works as normal.

ok gilles@

Revision 1.57 / (download) - annotate - [select for diffs], Mon Jul 16 06:00:04 2012 UTC (11 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.56: +3 -3 lines
Diff to previous 1.56 (colored)

sync the first example with the default conf file; ok gilles

Revision 1.56 / (download) - annotate - [select for diffs], Mon Jul 16 05:56:16 2012 UTC (11 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.55: +4 -4 lines
Diff to previous 1.55 (colored)

don;t quote things unneccessarily; ok gilles

Revision 1.55 / (download) - annotate - [select for diffs], Sun Jul 15 17:04:31 2012 UTC (11 years, 10 months ago) by gilles
Branch: MAIN
Changes since 1.54: +2 -2 lines
Diff to previous 1.54 (colored)

fix example

submitted by Marcus Merighi <mcmer-openbsd@tor.at>

Revision 1.54 / (download) - annotate - [select for diffs], Sun Jul 8 17:17:48 2012 UTC (11 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.53: +11 -7 lines
Diff to previous 1.53 (colored)

avoid line splitting; also, one an -> a

Revision 1.53 / (download) - annotate - [select for diffs], Sun Jul 8 15:48:00 2012 UTC (11 years, 11 months ago) by gilles
Branch: MAIN
Changes since 1.52: +28 -17 lines
Diff to previous 1.52 (colored)

- plug text_to_relayhost() in parse.y to support relay URLs.
- document the new URL syntax in smtpd.conf.5
- replace starttls:// schema with tls://

Beware, "relay via" rules should now be expressed with a relay URL:

	accept [...] relay via "mx1.example.org" smtps port 465
becomes accept [...] relay via "smtps://mx1.example.org"

This will allow using mappings of relays with different protocols and
options.

Make sure to update your smtpd.conf if you relay via !

ok eric, ok chl

Revision 1.52 / (download) - annotate - [select for diffs], Sun May 13 13:58:31 2012 UTC (12 years ago) by jmc
Branch: MAIN
Changes since 1.51: +3 -3 lines
Diff to previous 1.51 (colored)

tweak previous; ok gilles

Revision 1.51 / (download) - annotate - [select for diffs], Sat May 12 21:49:31 2012 UTC (12 years ago) by gilles
Branch: MAIN
Changes since 1.50: +24 -7 lines
Diff to previous 1.50 (colored)

- remove unused sources S_EXT, S_DYN and S_EXT from enum map_src
- continue simplification of parse.y
- remove "for network", if we ever need it we can reimport, probably no
  one knows of that undocumented strange feature ;-)
- change syntax for virtual domains configuration:

	  accept for virtual vmap	[...] <- wrong
	  accept for virtual map vmap	[...] <- right

  the reason for this change is that we will soon implement relay rules
  through maps and that keeping that syntax would make it inconsistent
  with the other rules.

- update man pages for makemap and smtpd.conf to reflect changes

ok eric@, looks ok chl@

Revision 1.50 / (download) - annotate - [select for diffs], Sat May 12 18:41:10 2012 UTC (12 years ago) by gilles
Branch: MAIN
Changes since 1.49: +7 -14 lines
Diff to previous 1.49 (colored)

- simplify a bit maps by removing fields which are still unused years
  after the initial ambitious implementation: byebye map type & map flags

- simplify a bit parse.y by removing assignations to these otherwise unused
  fields

- remove the DNS map source, it may be a good idea, but we can just add it
  when we plan to implement it (if we do)

- make the { } options in map declaration, it's been annoying me for a long
  time now, this allows the following to work:

       map "foobar" source plain "/etc/mail/foobar"

- update smtpd.conf.5 accordingly ;-)

Revision 1.49 / (download) - annotate - [select for diffs], Tue Apr 24 14:56:09 2012 UTC (12 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.48: +6 -4 lines
Diff to previous 1.48 (colored)

take a stab at documenting when arguments need quoted, and valid macro
characters;

prompted by a diff from robert peichaer org

thanks gilles and henning for feedback
ok deraadt zinke

Revision 1.48 / (download) - annotate - [select for diffs], Fri Apr 13 07:03:02 2012 UTC (12 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.47: +2 -2 lines
Diff to previous 1.47 (colored)

clarify "hostname"; from robert peichaer org
ok gilles

Revision 1.47 / (download) - annotate - [select for diffs], Tue Dec 13 23:55:00 2011 UTC (12 years, 5 months ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.46: +6 -3 lines
Diff to previous 1.46 (colored)

*finally* make use of certificate authority file if available !

bits from relayd, ok chl@, ok eric@

Revision 1.46 / (download) - annotate - [select for diffs], Tue Dec 13 21:47:09 2011 UTC (12 years, 5 months ago) by gilles
Branch: MAIN
Changes since 1.45: +3 -3 lines
Diff to previous 1.45 (colored)

- man page had an example wrong

spotted and diff by Ptter J. Philipp <php@centroid.eu> a while ago, thanks

Revision 1.45 / (download) - annotate - [select for diffs], Mon Oct 3 17:57:43 2011 UTC (12 years, 8 months ago) by gilles
Branch: MAIN
Changes since 1.44: +4 -3 lines
Diff to previous 1.44 (colored)

clarify that network sources are to be specified in CIDR notation

by David Walker, ok jmc@

Revision 1.44 / (download) - annotate - [select for diffs], Thu Jun 23 20:35:22 2011 UTC (12 years, 11 months ago) by sthen
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.43: +8 -3 lines
Diff to previous 1.43 (colored)

Use a common text explaining how the various configuration parsers using
the standard OpenBSD-style parse.y handle continuing lines with backslashes,
paying particular attention to how comments are handled (which can cause
nasty side-effects if you're not expecting it).

Most wording from jmc@, with suggestions from fgsch@, marc@, Richard Toohey,
patrick keshishian and Florian Obser, ok jmc@.

Revision 1.43 / (download) - annotate - [select for diffs], Fri Jun 10 11:30:35 2011 UTC (13 years ago) by jmc
Branch: MAIN
Changes since 1.42: +18 -10 lines
Diff to previous 1.42 (colored)

tweak previous;

Revision 1.42 / (download) - annotate - [select for diffs], Thu Jun 9 17:41:52 2011 UTC (13 years ago) by gilles
Branch: MAIN
Changes since 1.41: +24 -2 lines
Diff to previous 1.41 (colored)

'relay as' and 'relay via as' rules allow smtpd to rewrite the user part,
the domain part or the entire address of the sender at the SMTP sesssion
level. this is not masquerade but allows smtpd to communicate with hosts
that do a check of SMTP sender fqdn.

sent to tech@, a couple 'no regression' feedbacks

Revision 1.41 / (download) - annotate - [select for diffs], Sun May 22 22:03:43 2011 UTC (13 years ago) by jmc
Branch: MAIN
Changes since 1.40: +2 -2 lines
Diff to previous 1.40 (colored)

tweak previous;

Revision 1.40 / (download) - annotate - [select for diffs], Sun May 22 21:03:14 2011 UTC (13 years ago) by gilles
Branch: MAIN
Changes since 1.39: +4 -3 lines
Diff to previous 1.39 (colored)

teach smtpd how to listen on an interface group so that we can do:
	listen on egress
	listen on wlan

idea unvoluntarily suggested by Mikolaj Kucharski a few weeks ago,
unslacked after theo suggested it again.

Revision 1.39 / (download) - annotate - [select for diffs], Sun May 22 13:38:31 2011 UTC (13 years ago) by gilles
Branch: MAIN
Changes since 1.38: +14 -14 lines
Diff to previous 1.38 (colored)

fix examples so they stay do not use external utilities and do not refer
to external domains

prompted by deraadt@

Revision 1.38 / (download) - annotate - [select for diffs], Tue Mar 15 19:24:55 2011 UTC (13 years, 2 months ago) by gilles
Branch: MAIN
Changes since 1.37: +11 -6 lines
Diff to previous 1.37 (colored)

let smtpd use user-provided Diffie-Hellman parameters for ephemeral key
exchange. if no DH parameters are found, fallback to builtin parameters
as was done until now.

since we now accept user-provided DH parameters, make smtpd more strict
and fatal() if the parameters are bogus.

bump the key size of the DH parameters from 512bits to 1024bits, it might
be bumped further after some more research.

thanks to mikeb@ for his suggestions

diff ok mikeb@ , man ok jmc@

Revision 1.37 / (download) - annotate - [select for diffs], Sat Dec 18 22:25:24 2010 UTC (13 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.36: +22 -9 lines
Diff to previous 1.36 (colored)

document "certificate" a little better;
based on a diff from Sunil Nimmagadda

ok gilles

Revision 1.36 / (download) - annotate - [select for diffs], Fri Oct 29 09:16:08 2010 UTC (13 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.35: +103 -108 lines
Diff to previous 1.35 (colored)

smtpd no longer knows a map called "secrets" which holds credentials for
authenticated relaying. one can create many maps holding credentials and
name them however he/she wants, just like any other map.

teach smtpd how to select a credentials map at the rule-level allowing a
setup to relay through the same MX with different credentials depending
on the source.

smtpd.conf.5 updated to reflect changes with help from jmc@

Revision 1.35 / (download) - annotate - [select for diffs], Thu Oct 28 21:15:50 2010 UTC (13 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.34: +4 -2 lines
Diff to previous 1.34 (colored)

teach smtpd how to handle per-rule delays for message expiry, this allows
some rules to have a longer expiry delay than the default:

	accept for [...] relay expire 8d  # will stay 8 days in queue

I added the man page bits so I don't forget but I need to reword it a bit

Revision 1.34 / (download) - annotate - [select for diffs], Wed Sep 8 21:40:43 2010 UTC (13 years, 9 months ago) by gilles
Branch: MAIN
Changes since 1.33: +5 -3 lines
Diff to previous 1.33 (colored)

had planned to commit the change after oga@ and I are done with little
changes to lka_expand() but it looks like a bit more work :-)

Revision 1.33 / (download) - annotate - [select for diffs], Thu Jun 10 19:34:51 2010 UTC (14 years ago) by chl
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.32: +9 -1 lines
Diff to previous 1.32 (colored)

allow configure queue expiry

with help from jacekm@

ok gilles@ jacekm@

Revision 1.32 / (download) - annotate - [select for diffs], Tue Apr 27 14:39:24 2010 UTC (14 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.31: +4 -4 lines
Diff to previous 1.31 (colored)

sort the map types;

Revision 1.31 / (download) - annotate - [select for diffs], Tue Apr 27 10:17:53 2010 UTC (14 years, 1 month ago) by gilles
Branch: MAIN
Changes since 1.30: +8 -11 lines
Diff to previous 1.30 (colored)

this commit enables "plain" as a backend for maps (that means aliases,
virtual AND secrets), adds a description in smtpd.conf.5 and removes a
mention to special map "aliases" which was removed a while ago.

to use plain maps:  map "myaliases" { source plain "/etc/mail/aliases" }

code diff was okayd a while ago by jacekm@

Revision 1.30 / (download) - annotate - [select for diffs], Thu Apr 22 15:37:45 2010 UTC (14 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.29: +98 -99 lines
Diff to previous 1.29 (colored)

- sort the keyword list
- rewrite the description of "size"

ok gilles jacekm

Revision 1.29 / (download) - annotate - [select for diffs], Tue Apr 20 20:22:29 2010 UTC (14 years, 1 month ago) by jacekm
Branch: MAIN
Changes since 1.28: +6 -7 lines
Diff to previous 1.28 (colored)

Correct map definition syntax.  Reported by Rene Maroufi <info@maroufi.net>.

Revision 1.28 / (download) - annotate - [select for diffs], Tue Apr 20 20:09:40 2010 UTC (14 years, 1 month ago) by jacekm
Branch: MAIN
Changes since 1.27: +15 -4 lines
Diff to previous 1.27 (colored)

Document the ``alias <map>'' parameter.

Revision 1.27 / (download) - annotate - [select for diffs], Tue Apr 20 19:35:28 2010 UTC (14 years, 1 month ago) by jacekm
Branch: MAIN
Changes since 1.26: +9 -2 lines
Diff to previous 1.26 (colored)

Document ``size'' setting; OK gilles@

Revision 1.26 / (download) - annotate - [select for diffs], Thu Feb 25 14:53:37 2010 UTC (14 years, 3 months ago) by stevesk
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.25: +3 -3 lines
Diff to previous 1.25 (colored)

fix incorrect reference; ok jmc@ gilles@ jacekm@

Revision 1.25 / (download) - annotate - [select for diffs], Sun Oct 25 22:58:51 2009 UTC (14 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.24: +3 -3 lines
Diff to previous 1.24 (colored)

fix aliases map name in man page
reported by Emmanuel Vadot and David Hill

Revision 1.24 / (download) - annotate - [select for diffs], Mon Oct 19 21:19:13 2009 UTC (14 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 (colored)

update man pages

Revision 1.23 / (download) - annotate - [select for diffs], Fri Oct 16 22:29:46 2009 UTC (14 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.22: +2 -6 lines
Diff to previous 1.22 (colored)

after recent change in virtual maps support smtpd.conf.5 was not fully
updated and still referenced the "virtual" map which no longer exists.

issue spotted by Alexander Hall <alexander@beard.se>

Revision 1.22 / (download) - annotate - [select for diffs], Tue Oct 13 04:53:33 2009 UTC (14 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.21: +8 -8 lines
Diff to previous 1.21 (colored)

sort;

Revision 1.21 / (download) - annotate - [select for diffs], Mon Oct 12 22:49:10 2009 UTC (14 years, 7 months ago) by gilles
Branch: MAIN
Changes since 1.20: +8 -2 lines
Diff to previous 1.20 (colored)

document the new "for virtual map [...]" syntax

Revision 1.20 / (download) - annotate - [select for diffs], Fri Sep 25 13:44:33 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.19: +47 -4 lines
Diff to previous 1.19 (colored)

move the smtpd.conf-specific map bits back from makemap to smtpd.conf,
along with some tweakage;

ok jacekm gilles

Revision 1.19 / (download) - annotate - [select for diffs], Wed Sep 23 10:26:01 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.18: +29 -27 lines
Diff to previous 1.18 (colored)

minor tweaks for the filter section; ok jacekm

Revision 1.18 / (download) - annotate - [select for diffs], Tue Sep 22 13:05:20 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.17: +31 -87 lines
Diff to previous 1.17 (colored)

- move the map stuff to makemap.8
- use a single list for smtpd.conf keywords

ok jacekm gilles

Revision 1.17 / (download) - annotate - [select for diffs], Mon Sep 21 10:02:50 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.16: +17 -16 lines
Diff to previous 1.16 (colored)

- some tweaks for the global section
- syntax fix from gilles

ok gilles

Revision 1.16 / (download) - annotate - [select for diffs], Mon Sep 21 07:46:42 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.15: +20 -24 lines
Diff to previous 1.15 (colored)

merge EXPANSION into DESCRIPTION, since it is really part of
describing the file format;

ok jacekm

Revision 1.15 / (download) - annotate - [select for diffs], Sat Sep 19 15:51:58 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.14: +68 -40 lines
Diff to previous 1.14 (colored)

some minor improvements for this page, as well as an expanded examples
section to get things running;

help/ok jacekm gilles

Revision 1.14 / (download) - annotate - [select for diffs], Wed Sep 16 19:51:24 2009 UTC (14 years, 8 months ago) by jmc
Branch: MAIN
Changes since 1.13: +3 -2 lines
Diff to previous 1.13 (colored)

+.Xr mailer.conf 5 ,
ok jacekm

Revision 1.13 / (download) - annotate - [select for diffs], Fri Jun 5 23:04:51 2009 UTC (15 years ago) by jacekm
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6
Changes since 1.12: +7 -2 lines
Diff to previous 1.12 (colored)

if path in "deliver to maildir path" is omitted, use ~/Maildir by
default; from gilles@

Revision 1.12 / (download) - annotate - [select for diffs], Sat May 30 23:53:41 2009 UTC (15 years ago) by gilles
Branch: MAIN
Changes since 1.11: +11 -2 lines
Diff to previous 1.11 (colored)

It is now possible to specify a certificate to use when relaying to another
host which requests client certificates:

	accept [...] relay via [...] ssl certificate "mycert"

diff from Josh Elsasser <josh@elsasser.org>, tested and okayed by me with
no change but the addition of status 554 to the state machine to deal with
remote host telling us it doesn't like our certificate.

Revision 1.11 / (download) - annotate - [select for diffs], Thu May 28 08:43:45 2009 UTC (15 years ago) by jacekm
Branch: MAIN
Changes since 1.10: +6 -5 lines
Diff to previous 1.10 (colored)

Match SMTPAUTH documentation with reality; ok gilles@

Revision 1.10 / (download) - annotate - [select for diffs], Sun May 10 11:29:40 2009 UTC (15 years, 1 month ago) by jacekm
Branch: MAIN
Changes since 1.9: +3 -2 lines
Diff to previous 1.9 (colored)

assert copyright; ok gilles@

Revision 1.9 / (download) - annotate - [select for diffs], Fri Apr 10 05:35:31 2009 UTC (15 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.8: +8 -7 lines
Diff to previous 1.8 (colored)

tweaks;

Revision 1.8 / (download) - annotate - [select for diffs], Thu Apr 9 20:32:45 2009 UTC (15 years, 2 months ago) by jacekm
Branch: MAIN
Changes since 1.7: +244 -24 lines
Diff to previous 1.7 (colored)

make the manpage fairly complete, contains bits from jmc@

Revision 1.7 / (download) - annotate - [select for diffs], Tue Mar 17 00:18:39 2009 UTC (15 years, 2 months ago) by gilles
Branch: MAIN
Changes since 1.6: +7 -7 lines
Diff to previous 1.6 (colored)

update a bit, but more work is needed on this man page, working on it and
will commit an up to date version tomorrow

Revision 1.6 / (download) - annotate - [select for diffs], Sat Dec 20 00:22:09 2008 UTC (15 years, 5 months ago) by gilles
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE, OPENBSD_4_5
Changes since 1.5: +3 -2 lines
Diff to previous 1.5 (colored)

- update smtpd.conf to provide an example of an auth enabled listener
- update smtpd.conf.5 just to provide an example, a better description of
	"enable auth" will come when im done implementing it ;)

Revision 1.5 / (download) - annotate - [select for diffs], Fri Dec 12 17:24:51 2008 UTC (15 years, 5 months ago) by jacekm
Branch: MAIN
Changes since 1.4: +3 -4 lines
Diff to previous 1.4 (colored)

Kill references to smtpdb(8).

ok gilles@

Revision 1.4 / (download) - annotate - [select for diffs], Sat Dec 6 02:04:56 2008 UTC (15 years, 6 months ago) by gilles
Branch: MAIN
Changes since 1.3: +2 -1 lines
Diff to previous 1.3 (colored)

- it is now possible to specify an interface instead of an address or a
	hostname in a listen statement (ie: listen on lo0)
	request by deraadt@ a while ago, ok jacekm@

Revision 1.3 / (download) - annotate - [select for diffs], Sun Nov 2 08:19:13 2008 UTC (15 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.2: +23 -21 lines
Diff to previous 1.2 (colored)

various minor tweaks, including spelling fixes from Brian Keefer
and Jim Razmus;

Revision 1.2 / (download) - annotate - [select for diffs], Sun Nov 2 00:01:53 2008 UTC (15 years, 7 months ago) by sobrado
Branch: MAIN
Changes since 1.1: +4 -4 lines
Diff to previous 1.1 (colored)

write the command description (the .Nd macro) in a more usual way;
improve spacing in the FILES section.

ok gilles@

Revision 1.1 / (download) - annotate - [select for diffs], Sat Nov 1 21:35:28 2008 UTC (15 years, 7 months ago) by gilles
Branch: MAIN

smtpd is a smtp server implementation for OpenBSD. It is a work in progress
which still lacks many features. bringing it in tree will help working on it
more easily.

"at this stage it should go in" henning@, "move ahead" deraadt@

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.