sync with OpenBSD -current

This commit is contained in:
purplerain 2023-11-24 03:38:59 +00:00
parent 10cf24ada0
commit dde71458ae
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
28 changed files with 813 additions and 112 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.100 2023/08/18 01:37:41 djm Exp $ */
/* $OpenBSD: mux.c,v 1.101 2023/11/23 03:37:05 dtucker Exp $ */
/*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
*
@ -2257,7 +2257,7 @@ muxclient(const char *path)
switch (options.control_master) {
case SSHCTL_MASTER_AUTO:
case SSHCTL_MASTER_AUTO_ASK:
debug("auto-mux: Trying existing master");
debug("auto-mux: Trying existing master at '%s'", path);
/* FALLTHROUGH */
case SSHCTL_MASTER_NO:
break;