diff options
| -rw-r--r-- | doc/qmail-remote.html | 4 | ||||
| -rw-r--r-- | src/qmail-remote/qmail-remote-io.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/qmail-remote.html b/doc/qmail-remote.html index 1cfc91a..d8d3c99 100644 --- a/doc/qmail-remote.html +++ b/doc/qmail-remote.html @@ -55,7 +55,7 @@ where this version of <tt>qmail-remote</tt> is installed. <li> If the underlying OS and <a href="//skarnet.org/software/skalibs/">skalibs</a> support IPv6, then this <tt>qmail-remote</tt> does as well, and uses IPv4 and IPv6 addresses indiscriminately when connecting to an MX. </li> - <li> It speaks ESMTP and will use STARTTLS if the server supports it. </li> + <li> It will use STARTTLS if the server supports it. </li> <li> All its DNS resolutions are done in parallel, which eliminates some pathological cases where the original <tt>qmail-remote</tt> can hang around doing nothing for a <em>long</em> time. </li> @@ -105,7 +105,7 @@ This is useful in certain setups requiring client authentication. </dd> <dd> This file must be used in conjunction with <tt>clientcert</tt>. It contains the path to the private key used to sign the client certificate. Note that access to the private key file should be as restricted as possible, but the <tt>qmailr</tt> -user (or whatever user <tt>qmail-smtpc</tt> runs as) must be able to read it. </dd> +user (or whatever user <tt>qmail-remote</tt> runs as) must be able to read it. </dd> <dt> <tt>tlsstrictness</tt> </dt> <dd> This file contains an integer representing the strictness level expected of diff --git a/src/qmail-remote/qmail-remote-io.c b/src/qmail-remote/qmail-remote-io.c index 3f55f87..a855c20 100644 --- a/src/qmail-remote/qmail-remote-io.c +++ b/src/qmail-remote/qmail-remote-io.c @@ -122,8 +122,8 @@ static void blast (buffer *out, unsigned int timeout) if (buffer_putflush(out, ".\r\n", 3) < 0) qmailr_tempsys("qmail-remote-io: ", "unable to ", "finalize message data") ; } -static void smtp_body (buffer *in, buffer *out, char const *fmtip, char const *sender, char const *const *recip, unsigned int n, unsigned int timeout) gccattr_noreturn ; -static void smtp_body (buffer *in, buffer *out, char const *fmtip, char const *sender, char const *const *recip, unsigned int n, unsigned int timeout) +static inline void smtp_body (buffer *in, buffer *out, char const *fmtip, char const *sender, char const *const *recip, unsigned int n, unsigned int timeout) gccattr_noreturn ; +static inline void smtp_body (buffer *in, buffer *out, char const *fmtip, char const *sender, char const *const *recip, unsigned int n, unsigned int timeout) { tain deadline ; unsigned int code ; |