aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into portableopensmtpd-201606062303p1opensmtpd-201606062256p1gilles2016-06-062-76/+76
|\
| * sync with OpenBSD:opensmtpd-201606062256gilles2016-06-062-76/+76
* | Merge branch 'master' into portablegilles2016-06-052-81/+114
|\|
| * sync with OpenBSD:gilles2016-06-052-81/+114
* | Merge branch 'master' into portablegilles2016-06-054-140/+122
|\|
| * sync with OpenBSD:gilles2016-06-054-124/+122
* | Merge branch 'master' into portablegilles2016-05-3010-313/+531
|\|
| * sync with OpenBSD:gilles2016-05-3010-313/+531
* | Merge branch 'master' into portableGilles Chehade2016-05-225-147/+158
|\|
| * sync with OpenBSD:Gilles Chehade2016-05-225-147/+158
* | remove unused variableGilles Chehade2016-05-221-2/+0
* | Merge pull request #688 from rosorio/portableopensmtpd-201605221711p1Gilles Chehade2016-05-221-6/+2
|\ \
| * | fix openssl version check done wrong with an invalid maskRodrigo Osorio2016-05-021-6/+2
* | | Merge branch 'bsdsx-solaris_struct_tm' into portablegilles2016-05-222-1/+18
|\ \ \
| * | | Merge branch 'solaris_struct_tm' of https://github.com/bsdsx/OpenSMTPD into bsdsx-solaris_struct_tmgilles2016-05-222-1/+18
|/| | |
| * | | Some Os (as Solaris) don't have member tm_gmtoff in struct tmFreddy DISSAUX2016-05-062-5/+27
| * | | Revert "solaris don't have tm_gmtoff/tm_zone"Freddy DISSAUX2016-05-052-25/+2
| * | | Merge remote-tracking branch 'upstream/portable' into solaris_struct_tmFreddy DISSAUX2016-04-2521-173/+139
| |\| |
| * | | solaris don't have tm_gmtoff/tm_zoneFreddy DISSAUX2016-03-122-2/+25
* | | | Merge branch 'master' into portablegilles2016-05-222-93/+98
|\ \ \ \ | | |_|/ | |/| |
| * | | sync with OpenBSD:opensmtpd-201605221710gilles2016-05-222-93/+98
* | | | Merge branch 'portable' of ssh://ssh.poolp.org/git/opensmtpd into portablegilles2016-05-228-108/+117
|\ \ \ \
| * | | | Merge branch 'master' into portableGilles Chehade2016-05-210-0/+0
| |\| | |
| | * | | Merge pull request #692 from obadz/tag-char-fixesGilles Chehade2016-05-210-0/+0
| | |\ \ \
| | | * | | Fix more instances where '+' is hardcoded rather than TAG_CHARobadz2016-05-191-3/+3
| * | | | | Merge branch 'master' into portableGilles Chehade2016-05-214-84/+84
| |\| | | |
| | * | | | sync with OpenBSD:Gilles Chehade2016-05-214-84/+84
| | |/ / /
| * | | | require higher autoconf/automake versions and fix version checkJoerg Jung2016-05-201-4/+4
| * | | | Merge branch 'master' into portableGilles Chehade2016-05-165-96/+105
| |\| | |
| | * | | sync with OpenBSD:Gilles Chehade2016-05-165-96/+100
| | * | | do not forget to clear filter data state in error code path, thisGilles Chehade2016-05-091-0/+3
| | * | | plug memory and descriptor leakgilles2016-05-041-0/+2
* | | | | KNFgilles2016-05-121-7/+8
|/ / / /
* | | | Merge branch 'portable' of ssh://github.com/OpenSMTPD/OpenSMTPD into portablegilles2016-05-124-0/+15
|\ \ \ \
| * \ \ \ Merge pull request #670 from valeriangalliat/portable-ipv6onlyGilles Chehade2016-05-121-0/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | set IPV6_V6ONLY if availableValérian Galliat2016-03-201-0/+9
| | | |/ | | |/|
| * | | Merge pull request #667 from bsdsx/solaris_paths_hGilles Chehade2016-04-203-0/+6
| |\ \ \
| | * | | include paths.h if existsFreddy DISSAUX2016-03-123-0/+6
| | |/ /
* | | | fix build for non-libresslgilles2016-05-114-4/+41
* | | | Merge branch 'master' into portablegilles2016-05-0410-254/+220
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | sync with OpenBSD:gilles2016-05-0410-254/+220
* | | Merge branch 'master' into portablegilles2016-04-174-94/+93
|\| |
| * | sync with openbsd:gilles2016-04-174-94/+93
* | | Merge branch 'master' into portableGilles Chehade2016-03-2916-169/+130
|\| | | |/ |/|
| * sync with CVS:Gilles Chehade2016-03-2916-169/+130
* | Merge pull request #664 from bsdsx/solaris_have_ss_lenGilles Chehade2016-03-071-0/+2
|\ \
| * | use ss_len only if existsFreddy DISSAUX2016-03-051-0/+2
* | | Merge pull request #663 from bsdsx/solaris_configure_ac_includeGilles Chehade2016-03-071-0/+1
|\ \ \ | |/ / |/| |
| * | fix include for SSLeayFreddy DISSAUX2016-03-051-0/+1
|/ /
* | more u_int32_t -> uint32_tGilles Chehade2016-02-283-10/+10