upstream: allow %n to be expanded in ProxyCommand strings

From Zachary Harmany via github.com/openssh/openssh-portable/pull/118
ok dtucker@

OpenBSD-Commit-ID: 7eebf1b7695f50c66d42053d352a4db9e8fb84b6

1 files changed, 4 insertions, 3 deletions

diff --git a/sshconnect.h b/sshconnect.h
index b455d7c20..2e84b8bc5 100644
--- a/sshconnect.h
+++ b/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 *,