"for all" does not necessary apply to relay rules, so do not forget to look
for an alias map.

fixes "accept from all for all alias myaliases deliver to mbox" and makes
thib "super happy"

ok thib@

the smtpd env is meant to be global, so do not pass it all around.

discussed with and ok gilles@

remove all unused headers

a bit of .h cleanups, no functionnal change

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 m

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@

show more ...

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

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

show more ...

Missing semicolons to appease yyextract, ok gilles@

backout the "new" queue code commited 4 months ago. it has many good ideas,
is way more optimized than what we had earlier and there's definitely stuff
we want to keep, however it is early optimizati

backout the "new" queue code commited 4 months ago. it has many good ideas,
is way more optimized than what we had earlier and there's definitely stuff
we want to keep, however it is early optimization that doesn't account for
many features and makes them hard (if not impossible) to write without
ugly workarounds that ruin the purpose of the optimizations.

the backout goes to 30 May's right before the commit and catches up on all
the non-queue related commits that happened since then.

i'll work on reintroducing the ideas from this queue when the basic
features we expect from a MTA are implemented.

suggested on tech@ about a week ago, no objections, several "please make
smtpd move forward" mails from hackers and tech readers.

show more ...

- fix a regression caused by latest commit (long story made short: do not
attempt to expand the local delivery buffer when relaying mail, it was
kind of ok before but no longer is)
- use the same

- fix a regression caused by latest commit (long story made short: do not
attempt to expand the local delivery buffer when relaying mail, it was
kind of ok before but no longer is)
- use the same buffer for local deliveries to files and commands

tested by jmc@ and I

show more ...

when I fixed the ruleset matching on rules that had more than one condition
by expanding them to several rules, I forgot to copy the tags to the
expanded rules. this commit unbreaks matching rules by

when I fixed the ruleset matching on rules that had more than one condition
by expanding them to several rules, I forgot to copy the tags to the
expanded rules. this commit unbreaks matching rules by tag.

documentation follows shortly ...

spotted and fixed by me a while ago, jacekm@ timeout

show more ...

fix linecount bug with comments spanning multiple lines
problem reported with the obvious fix for bgpd by Sebastian Benoit
<benoit-lists at fb12.de>, also PR 6432
applied to all the others by yours t

fix linecount bug with comments spanning multiple lines
problem reported with the obvious fix for bgpd by Sebastian Benoit
<benoit-lists at fb12.de>, also PR 6432
applied to all the others by yours truly. ok theo
isn't it amazing how far this parser (and more) spread?

show more ...

allow configure queue expiry

with help from jacekm@

ok gilles@ jacekm@

new queue, again; gcc2 compile tested by deraadt

New queue doesn't compile on gcc2, back out. Spotted by deraadt@

Rewrite entire queue code.

Major goals:

1) Fix bad performance caused by the runner process doing full queue
read in 1s intervals. My Soekris can now happily accept >50 msg/s
while having multi-th

Rewrite entire queue code.

Major goals:

1) Fix bad performance caused by the runner process doing full queue
read in 1s intervals. My Soekris can now happily accept >50 msg/s
while having multi-thousand queue; before, one hundred queue would
bring the system to its knees.

2) Introduce Qmail-like scheduler that doesn't write as much to the
disk so that it needs less code for servicing error conditions,
which in some places can be tricky to get right.

3) Introduce separation between the scheduler and the backend; these
two queue aspects shouldn't be too tied too each other. This means
that eg. storing queue in SQL requires rewrite of just queue_backend.c.

4) Make on-disk queue format architecture independent, and more
easily extensible, to reduce number of flag days in the future.

Minor goals:

ENOSPC no longer prevents delivery attempts, fixed session limiting
for relayed mail, improved batching of "relay via" mails, human-readable
mailq output, "show queue raw" command, clearer logging, sending
of single bounce about multiple recipients, exact delay= computation,
zero delay between deliveries while within session limit (currently
1s delay between re-scheduling is enforced), mta no longer requests
content fd, corrected session limit for bounce submissions, tiny
<100B queue files instead of multi-KB, detect loops before accepting
mail, reduce traffic on imsg channels by killing enormous struct
submit_status.

show more ...

when a rule has two conditions (ie: accept for { domain foo, domain bar } )
expand to two rules each having its own condition rather than one rule
with a tail queue of conditions. this simplifies cod

when a rule has two conditions (ie: accept for { domain foo, domain bar } )
expand to two rules each having its own condition rather than one rule
with a tail queue of conditions. this simplifies code a bit and removes a
couple hacks.

basic testing by oga and me

show more ...

kill struct opt from struct rule, we don't use it, we don't need it

cleanup-only commit, removes unrequired includes, no functionnal change

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 whil

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@

show more ...

Support "accept from local ..." as documented in the man page.

Reported by Rene Maroufi <info@maroufi.net>

when a size is declared with a quantifier in smtpd.conf, have parse.y use
scan_scaled(3) to support the quantifiers rather than rolling my own code.

prompted by jacekm@

two lines were missing from previous commit

basic support for SIZE extension, has been sitting in my tree for a month
or so ...

okayd by jacekm@ a while ago

- fix netmask matching for AF_INET, it was broken in many ways, problem
was reported by nicm@ which spent a couple hours with me trying to
understand what was causing the bug, and helping me writ

- fix netmask matching for AF_INET, it was broken in many ways, problem
was reported by nicm@ which spent a couple hours with me trying to
understand what was causing the bug, and helping me write and test fix.

show more ...

Fix few read overruns found by parfait.
Nudge by deraadt@