From 273d9e16fc9e481283c2b2302b348e4863e29f28 Mon Sep 17 00:00:00 2001
From: joshua <>
Date: Fri, 11 Nov 2022 17:07:39 +0000
Subject: Remove the legacy interactive mode from openssl(1).

This removes the legacy interactive mode from openssl(1) since it is
rarely used, complicates the code, and has also been removed from
OpenSSL in version 3.x.x.

ok tb@ jsing@
---
 src/usr.bin/openssl/s_client.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/usr.bin/openssl/s_client.c')

diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index 15ebb0c0a7..41f6502325 100644
--- a/src/usr.bin/openssl/s_client.c
+++ b/src/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.58 2022/02/03 17:44:04 tb Exp $ */
+/* $OpenBSD: s_client.c,v 1.59 2022/11/11 17:07:39 joshua Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -923,11 +923,9 @@ s_client_main(int argc, char **argv)
 	struct sockaddr_storage peer;
 	int peerlen = sizeof(peer);
 
-	if (single_execution) {
-		if (pledge("stdio cpath wpath rpath inet dns tty", NULL) == -1) {
-			perror("pledge");
-			exit(1);
-		}
+	if (pledge("stdio cpath wpath rpath inet dns tty", NULL) == -1) {
+		perror("pledge");
+		exit(1);
 	}
 
 	memset(&s_client_config, 0, sizeof(s_client_config));
-- 
cgit v1.2.3-55-g6feb