Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into portableopensmtpd-201606062303p1opensmtpd-201606062256p1 | gilles | 2016-06-06 | 2 | -76/+76 |
|\ | |||||
| * | sync with OpenBSD:opensmtpd-201606062256 | gilles | 2016-06-06 | 2 | -76/+76 |
| | | | | | | | | - do not return on EAGAIN otherwise the event is never reloaded | ||||
* | | Merge branch 'master' into portable | gilles | 2016-06-05 | 2 | -81/+114 |
|\| | |||||
| * | sync with OpenBSD: | gilles | 2016-06-05 | 2 | -81/+114 |
| | | | | | | | | - add support for multi-line banners in delivery_lmtp | ||||
* | | Merge branch 'master' into portable | gilles | 2016-06-05 | 4 | -140/+122 |
|\| | |||||
| * | sync with OpenBSD: | gilles | 2016-06-05 | 4 | -124/+122 |
| | | | | | | | | | | | | - fix delivery_lmtp's handling of commands to support multiline replies - fix inet_net_pton() related hacks with cleaner inet_pton() construct - fix man page for trace | ||||
* | | Merge branch 'master' into portable | gilles | 2016-05-30 | 10 | -313/+531 |
|\| | |||||
| * | sync with OpenBSD: | gilles | 2016-05-30 | 10 | -313/+531 |
| | | | | | | | | - convert smtpd to fork+reexec to randomize address space per-process | ||||
* | | Merge branch 'master' into portable | Gilles Chehade | 2016-05-22 | 5 | -147/+158 |
|\| | |||||
| * | sync with OpenBSD: | Gilles Chehade | 2016-05-22 | 5 | -147/+158 |
| | | | | | | | | - introduce wip to improve log format | ||||
* | | remove unused variable | Gilles Chehade | 2016-05-22 | 1 | -2/+0 |
| | | |||||
* | | Merge pull request #688 from rosorio/portableopensmtpd-201605221711p1 | Gilles Chehade | 2016-05-22 | 1 | -6/+2 |
|\ \ | | | | | | | fix openssl version check done wrong with an invalid mask | ||||
| * | | fix openssl version check done wrong with an invalid mask | Rodrigo Osorio | 2016-05-02 | 1 | -6/+2 |
| | | | |||||
* | | | Merge branch 'bsdsx-solaris_struct_tm' into portable | gilles | 2016-05-22 | 2 | -1/+18 |
|\ \ \ | |||||
| * | | | Merge branch 'solaris_struct_tm' of https://github.com/bsdsx/OpenSMTPD into bsdsx-solaris_struct_tm | gilles | 2016-05-22 | 2 | -1/+18 |
|/| | | | |||||
| * | | | Some Os (as Solaris) don't have member tm_gmtoff in struct tm | Freddy DISSAUX | 2016-05-06 | 2 | -5/+27 |
| | | | | |||||
| * | | | Revert "solaris don't have tm_gmtoff/tm_zone" | Freddy DISSAUX | 2016-05-05 | 2 | -25/+2 |
| | | | | | | | | | | | | | | | | This reverts commit 1c9d330087741d4ffc6d718e696e11c909edb0b0. | ||||
| * | | | Merge remote-tracking branch 'upstream/portable' into solaris_struct_tm | Freddy DISSAUX | 2016-04-25 | 21 | -173/+139 |
| |\| | | |||||
| * | | | solaris don't have tm_gmtoff/tm_zone | Freddy DISSAUX | 2016-03-12 | 2 | -2/+25 |
| | | | | |||||
* | | | | Merge branch 'master' into portable | gilles | 2016-05-22 | 2 | -93/+98 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | sync with OpenBSD:opensmtpd-201605221710 | gilles | 2016-05-22 | 2 | -93/+98 |
| | | | | | | | | | | | | | | | | - use temporary variables to reduce changeset with portable | ||||
* | | | | Merge branch 'portable' of ssh://ssh.poolp.org/git/opensmtpd into portable | gilles | 2016-05-22 | 8 | -108/+117 |
|\ \ \ \ | |||||
| * | | | | Merge branch 'master' into portable | Gilles Chehade | 2016-05-21 | 0 | -0/+0 |
| |\| | | | |||||
| | * | | | Merge pull request #692 from obadz/tag-char-fixes | Gilles Chehade | 2016-05-21 | 0 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | | | TAG_CHAR fixes | ||||
| | | * | | | Fix more instances where '+' is hardcoded rather than TAG_CHAR | obadz | 2016-05-19 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into portable | Gilles Chehade | 2016-05-21 | 4 | -84/+84 |
| |\| | | | | |||||
| | * | | | | sync with OpenBSD: | Gilles Chehade | 2016-05-21 | 4 | -84/+84 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | - replace hardcoded '+' with TAG_CHAR - remove dead store - update documentation | ||||
| * | | | | require higher autoconf/automake versions and fix version check | Joerg Jung | 2016-05-20 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge branch 'master' into portable | Gilles Chehade | 2016-05-16 | 5 | -96/+105 |
| |\| | | | |||||
| | * | | | sync with OpenBSD: | Gilles Chehade | 2016-05-16 | 5 | -96/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - cvs id - document ca in smtpd.conf(5) - replace hard-coded '+' with TAG_CHAR | ||||
| | * | | | do not forget to clear filter data state in error code path, this | Gilles Chehade | 2016-05-09 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | can lead to a fatal() being triggered if bad sequence of events leads to the session being reused after it hit that codepath. | ||||
| | * | | | plug memory and descriptor leak | gilles | 2016-05-04 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | KNF | gilles | 2016-05-12 | 1 | -7/+8 |
|/ / / / | |||||
* | | | | Merge branch 'portable' of ssh://github.com/OpenSMTPD/OpenSMTPD into portable | gilles | 2016-05-12 | 4 | -0/+15 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #670 from valeriangalliat/portable-ipv6only | Gilles Chehade | 2016-05-12 | 1 | -0/+9 |
| |\ \ \ \ | | |_|_|/ | |/| | | | set IPV6_V6ONLY if available | ||||
| | * | | | set IPV6_V6ONLY if available | Valérian Galliat | 2016-03-20 | 1 | -0/+9 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #667 from bsdsx/solaris_paths_h | Gilles Chehade | 2016-04-20 | 3 | -0/+6 |
| |\ \ \ | | | | | | | | | | | include paths.h if exists | ||||
| | * | | | include paths.h if exists | Freddy DISSAUX | 2016-03-12 | 3 | -0/+6 |
| | |/ / | |||||
* | | | | fix build for non-libressl | gilles | 2016-05-11 | 4 | -4/+41 |
| | | | | |||||
* | | | | Merge branch 'master' into portable | gilles | 2016-05-04 | 10 | -254/+220 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | sync with OpenBSD: | gilles | 2016-05-04 | 10 | -254/+220 |
| | | | | | | | | | | | | | | | | | | - fix mailq to stop displaying invalid states - update man pages to describe the tracing feature - kill dhparams | ||||
* | | | Merge branch 'master' into portable | gilles | 2016-04-17 | 4 | -94/+93 |
|\| | | |||||
| * | | sync with openbsd: | gilles | 2016-04-17 | 4 | -94/+93 |
| | | | | | | | | | | | | | | | - update smtpd.conf(5) - remove MLINKS | ||||
* | | | Merge branch 'master' into portable | Gilles Chehade | 2016-03-29 | 16 | -169/+130 |
|\| | | |/ |/| | |||||
| * | sync with CVS: | Gilles Chehade | 2016-03-29 | 16 | -169/+130 |
| | | | | | | | | | | | | - cleanup fd non-blocking set + linger - documentation typo - various minor cleanups | ||||
* | | Merge pull request #664 from bsdsx/solaris_have_ss_len | Gilles Chehade | 2016-03-07 | 1 | -0/+2 |
|\ \ | | | | | | | use ss_len only if exists | ||||
| * | | use ss_len only if exists | Freddy DISSAUX | 2016-03-05 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #663 from bsdsx/solaris_configure_ac_include | Gilles Chehade | 2016-03-07 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | fix include for SSLeay() | ||||
| * | | fix include for SSLeay | Freddy DISSAUX | 2016-03-05 | 1 | -0/+1 |
|/ / | |||||
* | | more u_int32_t -> uint32_t | Gilles Chehade | 2016-02-28 | 3 | -10/+10 |
| | |