aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into portableopensmtpd-201311292259p1Eric Faurot2013-11-293-38/+92
|\
| * Rework the envelope flushing loops in mta to avoid sending all deliveryopensmtpd-201311292255Eric Faurot2013-11-293-38/+92
* | Merge branch 'master' into portableGilles Chehade2013-11-291-12/+4
|\|
| * Merge branch 'master' of https://github.com/poolpOrg/OpenSMTPDGilles Chehade2013-11-291-12/+4
| |\
| | * Merge pull request #366 from snimmagadda/tableGilles Chehade2013-11-291-12/+4
| | |\
| | | * Mention smtpctl encrypt subcommand.Sunil Nimmagadda2013-11-281-12/+4
* | | | Merge branch 'master' into portableGilles Chehade2013-11-291-13/+21
|\| | |
| * | | renable tempfail in scheduler for failed holdqEric Faurot2013-11-291-1/+1
| * | | Merge branch 'master' of ssh.poolp.org:/git/opensmtpdEric Faurot2013-11-294-14/+27
| |\ \ \
| * | | | Only send the RELEASE message if at least was held.Eric Faurot2013-11-291-13/+21
| | |/ / | |/| |
* | | | Merge branch 'master' into portableGilles Chehade2013-11-294-14/+27
|\ \ \ \ | | |/ / | |/| |
| * | | make scheduler buffer sizes tunableGilles Chehade2013-11-294-14/+27
| |/ /
* | | Merge branch 'master' into portableEric Faurot2013-11-291-1/+3
|\| |
| * | do not actually send the update to the queue.Eric Faurot2013-11-291-1/+3
* | | Merge branch 'master' into portableEric Faurot2013-11-295-6/+85
|\| |
| * | On relay failure, send a special release to inform the scheduler toEric Faurot2013-11-295-6/+85
* | | Merge branch 'master' into portableEric Faurot2013-11-283-2/+20
|\| |
| * | try to connect if neededEric Faurot2013-11-282-0/+18
| * | fix log msgEric Faurot2013-11-281-2/+2
| |/
* | Merge branch 'master' into portableopensmtpd-201311281211p1Gilles Chehade2013-11-2814-45/+49
|\|
| * fix regression introduced when plugged the passphrase-protected key supportopensmtpd-201311281209Gilles Chehade2013-11-281-2/+2
| * better responseEric Faurot2013-11-281-1/+1
| * missing errno checkEric Faurot2013-11-281-1/+1
| * properly use unsigned char casts for ctype functions.Eric Faurot2013-11-2813-41/+45
* | update copyright holdersCharles Longeau2013-11-271-7/+33
* | Sync openbsd-compat/defines.h with portable OpenSSH. While there, better handle MAILDIR's #define. Fix #364opensmtpd-201311270853p1Charles Longeau2013-11-271-10/+10
* | Merge branch 'master' into portableCharles Longeau2013-11-261-0/+1
|\|
| * update from -current:opensmtpd-201311270853Charles Longeau2013-11-261-0/+1
* | Merge branch 'portable' of ssh://ssh.poolp.org/git/opensmtpd into portableopensmtpd-201311261029p1Gilles Chehade2013-11-263-18/+19
|\ \
| * \ Merge branch 'portable' of github.com:poolpOrg/OpenSMTPD into portableCharles Longeau2013-11-250-0/+0
| |\ \
| * | | sync with latest asr changesCharles Longeau2013-11-253-18/+19
| * | | Merge branch 'master' into portableCharles Longeau2013-11-254-25/+65
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'master' into portableGilles Chehade2013-11-261-6/+6
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | update from -current:opensmtpd-201311261027Charles Longeau2013-11-251-6/+6
* | | Merge branch 'master' into portableGilles Chehade2013-11-253-19/+59
|\| | | |/ |/|
| * fix loading of passphrase protected keysGilles Chehade2013-11-253-19/+59
* | Merge branch 'master' into portableGilles Chehade2013-11-222-1/+3
|\|
| * update documentationGilles Chehade2013-11-221-0/+2
| * allow subdomain matching in mailaddr tablesGilles Chehade2013-11-221-1/+1
* | Merge branch 'master' into portableEric Faurot2013-11-211-1/+1
|\|
| * do not update counters on EAGAINEric Faurot2013-11-211-1/+1
* | thanks people, without trying to explain why :-pCharles Longeau2013-11-211-12/+15
* | sync with latest changes from OpenBSDCharles Longeau2013-11-211-3/+3
* | Merge branch 'master' into portableGilles Chehade2013-11-201-1/+1
|\|
| * print CAfile pathGilles Chehade2013-11-201-1/+1
* | Merge branch 'master' into portableopensmtpd-201311201707p1Gilles Chehade2013-11-201-1/+4
|\|
| * fail if lka can't load CAfileopensmtpd-201311201704Gilles Chehade2013-11-201-1/+4
* | Merge branch 'master' into portableEric Faurot2013-11-201-4/+5
|\|
| * Merge branch 'master' of ssh.poolp.org:/git/opensmtpdEric Faurot2013-11-201-1/+3
| |\
| * | correctly handle EAGAIN and closed pipe in msgbuf_write()Eric Faurot2013-11-201-4/+5