The branch OpenSSL_1_1_0-stable has been updated
via 36097bd81a8ec365c94e33ec3bac2f143cbf0b16 (commit)
from f48e792f1b2178c629fad6b23d15e9ec01535d43 (commit)
- Log -----------------------------------------------------------------
commit 36097bd81a8ec365c94e33ec3bac2f143cbf0b16
Author: Balaji Marisetti <[email protected]>
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 <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4067)
(cherry picked from commit 326eaa941e03a8922a3789ccab0d134c63d05c92)
-----------------------------------------------------------------------
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 ce1a408..2f1b228 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1370,11 +1370,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
if (split_send_fragment > SSL3_RT_MAX_PLAIN_LENGTH) {
BIO_printf(bio_err, "Bad split send fragment size\n");
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
