From: Matt Caswell <matt@openssl.org>
Date: Tue, 2 Jun 2015 19:18:05 +0000 (+0100)
Subject: Fix compilation failure for some tool chains
X-Git-Tag: OpenSSL_1_0_2b~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1d5b8a4a47f0f3c0e10c904b3b0fdc53a235fd0;p=oweals%2Fopenssl.git

Fix compilation failure for some tool chains

Some tool chains (e.g. android) do not define IP_PMTUDISC_PROBE, and so
this build breaks.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 133dce447b259e0bb93076bf5fd0ce475d16910a)
---

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 6493a38c08..7fcd831da0 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -897,7 +897,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                 perror("setsockopt");
                 ret = -1;
             }
-# elif defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER)
+# elif defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined (IP_PMTUDISC_PROBE)
             if ((sockopt_val = num ? IP_PMTUDISC_PROBE : IP_PMTUDISC_DONT),
                 (ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,
                                   &sockopt_val, sizeof(sockopt_val))) < 0) {