- (djm) OpenBSD CVS Sync

   - djm@cvs.openbsd.org 2005/06/17 22:53:47
     [ssh.c sshconnect.c]
     Fix ControlPath's %p expanding to "0" for a default port,
     spotted dwmw2 AT infradead.org; ok markus@

diff --git a/ChangeLog b/ChangeLog
index aea4a092d09aa786d9e8081adf3f0822bac87f90..5115e522b3bc604ff0ad03736474301ffee6e2fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20050626
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2005/06/17 22:53:47
+     [ssh.c sshconnect.c]
+     Fix ControlPath's %p expanding to "0" for a default port,
+     spotted dwmw2 AT infradead.org; ok markus@
+
 20050618
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2005/05/20 12:57:01;

diff --git a/ssh.c b/ssh.c
index 5d53cd6804bf29077b711f6e9d1fa7b588205591..2e93b161ae1a8e2ec6ad1771145f60d0b534ec8c 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.243 2005/06/16 03:38:36 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.244 2005/06/17 22:53:46 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -185,6 +185,7 @@ main(int ac, char **av)
        int dummy;
        extern int optind, optreset;
        extern char *optarg;
+       struct servent *sp;
        Forward fwd;
 
        __progname = ssh_get_progname(av[0]);
@@ -623,6 +624,12 @@ again:
        if (options.control_path != NULL)
                control_client(options.control_path);
 
+       /* Get default port if port has not been set. */
+       if (options.port == 0) {
+               sp = getservbyname(SSH_SERVICE_NAME, "tcp");
+               options.port = sp ? ntohs(sp->s_port) : SSH_DEFAULT_PORT;
+       }
+
        /* Open a connection to the remote host. */
        if (ssh_connect(host, &hostaddr, options.port,
            options.address_family, options.connection_attempts,

diff --git a/sshconnect.c b/sshconnect.c
index cbbe54821cf2ced1ff81c2c5694a2444ee0b1abd..92f0f3800afc809698e6df8751dcb1c3a166fc88 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.165 2005/06/17 02:44:33 djm Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.166 2005/06/17 22:53:47 djm Exp $");
 
 #include <openssl/bn.h>
 
@@ -289,18 +289,9 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
        int sock = -1, attempt;
        char ntop[NI_MAXHOST], strport[NI_MAXSERV];
        struct addrinfo hints, *ai, *aitop;
-       struct servent *sp;
 
        debug2("ssh_connect: needpriv %d", needpriv);
 
-       /* Get default port if port has not been set. */
-       if (port == 0) {
-               sp = getservbyname(SSH_SERVICE_NAME, "tcp");
-               if (sp)
-                       port = ntohs(sp->s_port);
-               else
-                       port = SSH_DEFAULT_PORT;
-       }
        /* If a proxy command is given, connect using it. */
        if (proxy_command != NULL)
                return ssh_proxy_connect(host, port, proxy_command);