- (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG.

[openssh.git] / sshconnect.c

diff --git a/sshconnect.c b/sshconnect.c
index 3c8308ffb9755ac639065a334c7c0842c099d1a4..63c4650f738b9957903d5fdecfff5385f48337df 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.216 2009/11/10 04:30:45 dtucker Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.218 2010/01/13 00:19:04 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -191,8 +191,7 @@ ssh_create_socket(int privileged, struct addrinfo *ai)
                        debug("Allocated local port %d.", p);
                return sock;
        }
-       sock = socket_rdomain(ai->ai_family, ai->ai_socktype, ai->ai_protocol,
-           options.rdomain);
+       sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
        if (sock < 0) {
                error("socket: %.100s", strerror(errno));
                return -1;
@@ -930,7 +929,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                 * XXX Should permit the user to change to use the new id.
                 * This could be done by converting the host key to an
                 * identifying sentence, tell that the host identifies itself
-                * by that sentence, and ask the user if he/she whishes to
+                * by that sentence, and ask the user if he/she wishes to
                 * accept the authentication.
                 */
                break;