[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  326eaa941e03a8922a3789ccab0d134c63d05c92 (commit)
      from  77a9c26e03ccfec8d16985bce79e95eb6dc2dd2e (commit)


- Log -----------------------------------------------------------------
commit 326eaa941e03a8922a3789ccab0d134c63d05c92
Author: Balaji Marisetti <bmarisetti at caviumnetworks.com>
Date:   Tue Aug 1 16:54:13 2017 +0530

    Addressed build failure because of missing #ifdef AF_UNIX guard
    CLA: trivial
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4067)

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

Summary of changes:
 apps/s_client.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/s_client.c b/apps/s_client.c
index 45464a4..5ae52b4 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1522,11 +1522,13 @@ int s_client_main(int argc, char **argv)
         }
     }
 
+#ifdef AF_UNIX
     if (socket_family == AF_UNIX && socket_type != SOCK_STREAM) {
         BIO_printf(bio_err,
                    "Can't use unix sockets and datagrams together\n");
         goto end;
     }
+#endif
 
 #ifndef OPENSSL_NO_SCTP
     if (protocol == IPPROTO_SCTP) {