From: djm@openbsd.org Date: Thu, 16 Oct 2025 00:00:36 +0000 (+0000) Subject: upstream: missed a case in previous X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3fdb82fb02723dbe139f9d4be274d7fddfb7983;p=thirdparty%2Fopenssh-portable.git upstream: missed a case in previous OpenBSD-Commit-ID: 271c5602b5e719ee3def19dbd9a33328b4fa7edc --- diff --git a/clientloop.c b/clientloop.c index 15bf7c1e8..1f2dad3f1 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.416 2025/10/15 23:55:01 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.417 2025/10/16 00:00:36 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1457,7 +1457,9 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg, debug("Entering interactive session."); session_ident = ssh2_chan_id; - if (options.control_master && + if (options.pkcs11_provider != NULL) + debug("pledge: disabled (PKCS11Provider active)"); + else if (options.control_master && !option_clear_or_none(options.control_path)) { debug("pledge: id"); if (pledge("stdio rpath wpath cpath unix inet dns recvfd sendfd proc exec id tty",