summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL6
-rw-r--r--doc/index.html6
-rw-r--r--src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/INSTALL b/INSTALL
index 53b8685..fe9ee2f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ Build Instructions
- A Linux-based system with a standard C development environment
- GNU make version 3.81 or later
- - skalibs version 2.10.0.3 or later: https://skarnet.org/software/skalibs/
- - s6 version 2.10.0.3 or later: https://skarnet.org/software/s6/
- - (optional but recommended): s6-networking version 2.4.1.1 or later:
+ - skalibs version 2.11.0.0 or later: https://skarnet.org/software/skalibs/
+ - s6 version 2.11.0.0 or later: https://skarnet.org/software/s6/
+ - (optional but recommended): s6-networking version 2.5.0.0 or later:
https://skarnet.org/software/s6-networking/
This software will run on any operating system that implements
diff --git a/doc/index.html b/doc/index.html
index 376ebf2..f55279d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -34,13 +34,13 @@ inetd-like mail servers that do not already support it.
<li> A POSIX-compliant system with a standard C development environment </li>
<li> GNU make, version 3.81 or later </li>
<li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.10.0.3 or later. It's a build-time requirement. It's also a run-time
+2.11.0.0 or later. It's a build-time requirement. It's also a run-time
requirement if you link against the shared version of the skalibs
library. </li>
<li> <a href="//skarnet.org/software/s6/">s6</a> version
-2.10.0.3 or later. It's a build-time and run-time requirement. </li>
+2.11.0.0 or later. It's a build-time and run-time requirement. </li>
<li> Recommended at run-time: <a href="//skarnet.org/software/s6-networking/">s6-networking</a> version
-2.4.1.1 or later. It's not a requirement, but you won't be able
+2.5.0.0 or later. It's not a requirement, but you won't be able
to do much with smtpd-starttls-proxy if you don't have a suitable
UCSPI-TLS server tool, and <a href="//skarnet.org/software/s6-networking/">s6-networking</a>
provides a simple one. </li>
diff --git a/src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c b/src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c
index fcb1abd..6635745 100644
--- a/src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c
+++ b/src/smtpd-starttls-proxy/smtpd-starttls-proxy-io.c
@@ -232,7 +232,7 @@ static void child (int, int) gccattr_noreturn ;
static void child (int fdr, int fdw)
{
iopause_fd x[4] = { { .fd = 0 }, { .fd = 1 }, { .fd = fdr }, { .fd = fdw } } ;
- tain_t deadline ;
+ tain deadline ;
PROG = "smtpd-starttls-proxy-io" ;
if (ndelay_on(0) < 0 || ndelay_on(1) < 0 || ndelay_on(fdr) < 0 || ndelay_on(fdw) < 0)
@@ -356,7 +356,7 @@ int main (int argc, char const *const *argv)
int p[2][2] ;
PROG = "smtpd-starttls-proxy-io (parent)" ;
{
- subgetopt_t l = SUBGETOPT_ZERO ;
+ subgetopt l = SUBGETOPT_ZERO ;
for (;;)
{
int opt = subgetopt_r(argc, argv, "", &l) ;