upstream: Zap unused family parameter from ssh_connect_direct()

sshconnect.c r1.241 from 2013 made it unused;  found while reading code.

OK djm

OpenBSD-Commit-ID: 219ba6d7f9925d0b7992918612680399d86712b5

diff --git a/ssh.c b/ssh.c
index 0329e484712df7b314d1dba50ad49b0a8e2dcb04..563f4cdf265de9dca5296526063d5016da3bf68f 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.537 2020/10/03 09:22:26 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.538 2020/10/12 08:36:36 kn Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1542,7 +1542,7 @@ main(int ac, char **av)
 
        /* Open a connection to the remote host. */
        if (ssh_connect(ssh, host, host_arg, addrs, &hostaddr, options.port,
-           options.address_family, options.connection_attempts,
+           options.connection_attempts,
            &timeout_ms, options.tcp_keep_alive) != 0)
                exit(255);
 

diff --git a/sshconnect.c b/sshconnect.c
index d73cecc809513863d9ce8cc6a27a618e11658a98..7426ca99576bcc1ee749521b56a1caeb40639bb8 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.339 2020/10/07 02:26:28 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.340 2020/10/12 08:36:37 kn Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -442,8 +442,8 @@ fail:
  */
 static int
 ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
-    struct sockaddr_storage *hostaddr, u_short port, int family,
-    int connection_attempts, int *timeout_ms, int want_keepalive)
+    struct sockaddr_storage *hostaddr, u_short port, int connection_attempts,
+    int *timeout_ms, int want_keepalive)
 {
        int on = 1, saved_timeout_ms = *timeout_ms;
        int oerrno, sock = -1, attempt;
@@ -533,13 +533,13 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
 int
 ssh_connect(struct ssh *ssh, const char *host, const char *host_arg,
     struct addrinfo *addrs, struct sockaddr_storage *hostaddr, u_short port,
-    int family, int connection_attempts, int *timeout_ms, int want_keepalive)
+    int connection_attempts, int *timeout_ms, int want_keepalive)
 {
        int in, out;
 
        if (options.proxy_command == NULL) {
                return ssh_connect_direct(ssh, host, addrs, hostaddr, port,
-                   family, connection_attempts, timeout_ms, want_keepalive);
+                   connection_attempts, timeout_ms, want_keepalive);
        } else if (strcmp(options.proxy_command, "-") == 0) {
                if ((in = dup(STDIN_FILENO)) == -1 ||
                    (out = dup(STDOUT_FILENO)) == -1) {

diff --git a/sshconnect.h b/sshconnect.h
index b2fbf157915b45035e032c5185328bed824e7676..13131d301a796c222333c422fc70822fc65bc902 100644 (file)
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.h,v 1.42 2020/10/07 02:22:23 djm Exp $ */
+/* $OpenBSD: sshconnect.h,v 1.43 2020/10/12 08:36:37 kn Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -35,7 +35,7 @@ struct ssh;
 
 int     ssh_connect(struct ssh *, const char *, const char *,
            struct addrinfo *, struct sockaddr_storage *, u_short,
-           int, int, int *, int);
+           int, int *, int);
 void    ssh_kill_proxy_command(void);
 
 void    ssh_login(struct ssh *, Sensitive *, const char *,