[exim-cvs] Fix build on FreeBSD 11

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Fix build on FreeBSD 11
Gitweb: https://git.exim.org/exim.git/commitdiff/dbcb6d0acbbd69b8a68ba117530e00300ec698ba
Commit:     dbcb6d0acbbd69b8a68ba117530e00300ec698ba
Parent:     ba97ac87b13f2f7380621ca998174b25cc7b2532
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Nov 6 16:00:26 2018 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue Nov 6 16:00:26 2018 +0000


    Fix build on FreeBSD 11
---
 src/src/smtp_in.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index a579b8f..2e3c9b9 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2408,12 +2408,15 @@ struct tcp_info tinfo;
socklen_t len = sizeof(tinfo);

 if (getsockopt(fileno(smtp_out), IPPROTO_TCP, TCP_INFO, &tinfo, &len) == 0)
+#ifdef TCPI_OPT_SYN_DATA    /* FreeBSD 11 does not seem to have this yet */
   if (tinfo.tcpi_options & TCPI_OPT_SYN_DATA)
     {
     DEBUG(D_receive) debug_printf("TCP_FASTOPEN mode connection (ACKd data-on-SYN)\n");
     f.tcp_in_fastopen_data = f.tcp_in_fastopen = TRUE;
     }
-  else if (tinfo.tcpi_state == TCP_SYN_RECV)
+  else
+#endif
+    if (tinfo.tcpi_state == TCP_SYN_RECV)
     {
     DEBUG(D_receive) debug_printf("TCP_FASTOPEN mode connection (state TCP_SYN_RECV)\n");
     f.tcp_in_fastopen = TRUE;