summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-10-03 18:16:48 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-10-03 18:16:48 +0000
commitfb49cff57b926c91afdec396760be62857b21a73 (patch)
tree30c0406120397b155ff1b1103f191f1c1ddd6c52 /usr.bin
parent6529ecd87e6b9acd802319ac8cc214567f5cdbac (diff)
do not resolve canonname, i have no idea why this was added oin ossh
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 1a7b0c96930..e2a399945aa 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.66 2000/09/12 20:53:10 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.67 2000/10/03 18:16:47 markus Exp $");
#include <openssl/evp.h>
#include <openssl/dsa.h>
@@ -559,22 +559,6 @@ main(int ac, char **av)
if (options.hostname != NULL)
host = options.hostname;
- /* Find canonic host name. */
- if (strchr(host, '.') == 0) {
- struct addrinfo hints;
- struct addrinfo *ai = NULL;
- int errgai;
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = IPv4or6;
- hints.ai_flags = AI_CANONNAME;
- hints.ai_socktype = SOCK_STREAM;
- errgai = getaddrinfo(host, NULL, &hints, &ai);
- if (errgai == 0) {
- if (ai->ai_canonname != NULL)
- host = xstrdup(ai->ai_canonname);
- freeaddrinfo(ai);
- }
- }
/* Disable rhosts authentication if not running as root. */
if (original_effective_uid != 0 || !options.use_privileged_port) {
options.rhosts_authentication = 0;