merge 5.7p1

1 files changed, 8 insertions, 4 deletions

diff --git a/sshconnect.h b/sshconnect.h
index c59a097f4..fd7f7f7c6 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.h,v 1.25 2009/05/27 06:38:16 andreas Exp $ */
+/* $OpenBSD: sshconnect.h,v 1.27 2010/11/29 23:45:51 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -34,16 +34,20 @@ struct Sensitive {
 int
 ssh_connect(const char *, struct sockaddr_storage *, u_short, int, int,
     int *, int, int, const char *);
+void     ssh_kill_proxy_command(void);
 
-void
-ssh_login(Sensitive *, const char *, struct sockaddr *, struct passwd *, int);
+void     ssh_login(Sensitive *, const char *, struct sockaddr *, u_short,
+    struct passwd *, int);
 
 void     ssh_exchange_identification(int);
 
 int      verify_host_key(char *, struct sockaddr *, Key *);
 
+void     get_hostfile_hostname_ipaddr(char *, struct sockaddr *, u_short,
+    char **, char **);
+
 void     ssh_kex(char *, struct sockaddr *);
-void     ssh_kex2(char *, struct sockaddr *);
+void     ssh_kex2(char *, struct sockaddr *, u_short);
 
 void     ssh_userauth1(const char *, const char *, char *, Sensitive *);
 void     ssh_userauth2(const char *, const char *, char *, Sensitive *);