Commit d2307ad06d for openssl.org

commit d2307ad06d5510352ce2fc9ad2c87461fd60966a
Author: Tomas Mraz <tomas@openssl.foundation>
Date:   Wed Aug 26 14:29:20 2026 +0200

    s_server: Do not override -Verify with -verify_return_error

    Or the verification flags in instead of overriding
    the previous value with -verify_return_error.

    Fixes e5f01903ed7

    Reviewed-by: Milan Broz <mbroz@openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
    Merge-date: Thu Aug 27 16:15:34 2026
    Merged-from: https://github.com/openssl/openssl/pull/32512

diff --git a/apps/s_server.c b/apps/s_server.c
index 50926e4377..f9ff9b769b 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2026,7 +2026,7 @@ int s_server_main(int argc, char *argv[])
                 goto end;
             break;
         case OPT_VERIFY_RET_ERROR:
-            s_server_verify = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
+            s_server_verify |= SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE;
             verify_args.return_error = 1;
             break;
         case OPT_VERIFY_QUIET: