Merge branch 'rsalz-docfixes'

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 7c4f7bc7d75493595c5a486f6762c742863a2a60..6dabdf4f4064351f2100c14c2c516c998faee678 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -526,6 +526,7 @@ static void sv_usage(void)
        BIO_printf(bio_err," -state        - Print the SSL states\n");
        BIO_printf(bio_err," -CApath arg   - PEM format directory of CA's\n");
        BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
+       BIO_printf(bio_err," -trusted_first - Use locally trusted CA's first when building trust chain\n");
        BIO_printf(bio_err," -nocert       - Don't use any certificates (Anon-DH)\n");
        BIO_printf(bio_err," -cipher arg   - play with 'openssl ciphers' to see what goes here\n");
        BIO_printf(bio_err," -serverpref   - Use server's cipher preferences\n");
@@ -1011,7 +1012,9 @@ int MAIN(int argc, char *argv[])
        int badarg = 0;
        short port=PORT;
        const char *unix_path=NULL;
+#ifndef NO_SYS_UN_H
        int unlink_unix_path=0;
+#endif
        int (*server_cb)(char *hostname, int s, int stype, unsigned char *context);
        char *CApath=NULL,*CAfile=NULL;
        char *chCApath=NULL,*chCAfile=NULL;
@@ -2140,6 +2143,7 @@ bad:
                server_cb = www_body;
        else
                server_cb = sv_body;
+#ifndef NO_SYS_UN_H
        if (unix_path)
                {
                if (unlink_unix_path)
@@ -2147,6 +2151,7 @@ bad:
                do_server_unix(unix_path,&accept_socket,server_cb, context, naccept);
                }
        else
+#endif
                do_server(port,socket_type,&accept_socket,server_cb, context, naccept);
        print_stats(bio_s_out,ctx);
        ret=0;