diff options
| author |   djm <djm@openbsd.org> | 2019-09-13 04:27:35 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-09-13 04:27:35 +0000 |
| commit | 2e5f52195db1f07c4b0e675efe9aa38409e9b42b (patch) | |
| tree | 7db3b28991e43fa2055b4e8a051a472a89952f81 /usr.bin/ssh/sshconnect.h | |
| parent | clarify that ConnectTimeout applies both to the TCP connection and to (diff) | |
| download | wireguard-openbsd-2e5f52195db1f07c4b0e675efe9aa38409e9b42b.tar.xz wireguard-openbsd-2e5f52195db1f07c4b0e675efe9aa38409e9b42b.zip | |
allow %n to be expanded in ProxyCommand strings
From Zachary Harmany via github.com/openssh/openssh-portable/pull/118
ok dtucker@
Diffstat (limited to 'usr.bin/ssh/sshconnect.h')
| -rw-r--r-- | usr.bin/ssh/sshconnect.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect.h b/usr.bin/ssh/sshconnect.h index b455d7c20b5..2e84b8bc523 100644 --- a/usr.bin/ssh/sshconnect.h +++ b/usr.bin/ssh/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.38 2019/06/21 04:21:05 djm Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.39 2019/09/13 04:27:35 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -33,8 +33,9 @@ struct Sensitive { struct addrinfo; struct ssh; -int ssh_connect(struct ssh *, const char *, struct addrinfo *, - struct sockaddr_storage *, u_short, int, int, int *, int); +int ssh_connect(struct ssh *, const char *, const char *, + struct addrinfo *, struct sockaddr_storage *, u_short, + int, int, int *, int); void ssh_kill_proxy_command(void); void ssh_login(struct ssh *, Sensitive *, const char *, |