breeze/openssh-portable
1
0
Fork 0
mirror of https://github.com/openssh/openssh-portable.git synced 2026-01-12 00:04:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

upstream: missed a case in previous

Browse Source 
OpenBSD-Commit-ID: 271c5602b5e719ee3def19dbd9a33328b4fa7edc
This commit is contained in:
djm@openbsd.org
2025-10-16 00:00:36 +00:00
committed by Damien Miller
parent d926a84d17
commit e3fdb82fb0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clientloop.c
View File

@@ -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 <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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",