[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  133dce447b259e0bb93076bf5fd0ce475d16910a (commit)
      from  591b7aef05b22cba09b179e5787a9bf40dfc9508 (commit)


- Log -----------------------------------------------------------------
commit 133dce447b259e0bb93076bf5fd0ce475d16910a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jun 2 20:18:05 2015 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_dgram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 7cd57bf..3f6cd50 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -882,7 +882,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) {