[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  df05f155a69b96b174e0e47bc689bf729de684b6 (commit)
      from  cf8e9233f0139f8ebacbfd4fa34ccf410ec8430c (commit)


- Log -----------------------------------------------------------------
commit df05f155a69b96b174e0e47bc689bf729de684b6
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Jan 26 19:15:28 2018 +0100

    Fix some style nits in commit eee8a40
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5173)

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

Summary of changes:
 apps/s_socket.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/s_socket.c b/apps/s_socket.c
index 4f1e751..485b419 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -187,17 +187,19 @@ int do_server(int *accept_sock, const char *host, const char *port,
     sock_protocol = BIO_ADDRINFO_protocol(res);
     sock_address = BIO_ADDRINFO_address(res);
     next = BIO_ADDRINFO_next(res);
-    if(sock_family == AF_INET6)
+    if (sock_family == AF_INET6)
         sock_options |= BIO_SOCK_V6_ONLY;
     if (next != NULL
-        && BIO_ADDRINFO_socktype(next) == sock_type
-        && BIO_ADDRINFO_protocol(next) == sock_protocol) {
-        if (sock_family == AF_INET && BIO_ADDRINFO_family(next) == AF_INET6) {
+            && BIO_ADDRINFO_socktype(next) == sock_type
+            && BIO_ADDRINFO_protocol(next) == sock_protocol) {
+        if (sock_family == AF_INET
+                && BIO_ADDRINFO_family(next) == AF_INET6) {
             sock_family = AF_INET6;
             sock_address = BIO_ADDRINFO_address(next);
-        }
-        else if (sock_family == AF_INET6 && BIO_ADDRINFO_family(next) == AF_INET)
+        } else if (sock_family == AF_INET6
+                   && BIO_ADDRINFO_family(next) == AF_INET) {
             sock_options &= ~BIO_SOCK_V6_ONLY;
+        }
     }
 
     asock = BIO_socket(sock_family, sock_type, sock_protocol, 0);