Commit d667fa22 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix some style nits in commit eee8a40a 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5173)

(cherry picked from commit df05f155)
parent 847997f9

apps/s_socket.c

+8 −6
Original line number Diff line number Diff line
@@ -165,13 +165,15 @@ int do_server(int *accept_sock, const char *host, const char *port, 
    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) {

        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);

    if (asock == INVALID_SOCKET