- dtucker@cvs.openbsd.org 2010/01/09 23:04:13
[channels.c ssh.1 servconf.c sshd_config.5 sshd.c channels.h servconf.h
ssh-keyscan.1 ssh-keyscan.c readconf.c sshconnect.c misc.c ssh.c
readconf.h scp.1 sftp.1 ssh_config.5 misc.h]
Remove RoutingDomain from ssh since it's now not needed. It can be
replaced with "route exec" or "nc -V" as a proxycommand. "route exec"
also ensures that trafic such as DNS lookups stays withing the specified
routingdomain. For example (from reyk):
# route -T 2 exec /usr/sbin/sshd
or inherited from the parent process
$ route -T 2 exec sh
$ ssh 10.1.2.3
ok deraadt@ markus@ stevesk@ reyk@
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index faeb9e1..7afe446 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.80 2009/12/25 19:40:21 stevesk Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.81 2010/01/09 23:04:13 dtucker Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -68,9 +68,6 @@
int maxfd;
#define MAXCON (maxfd - 10)
-/* The default routing domain */
-int scan_rdomain = -1;
-
extern char *__progname;
fd_set *read_wait;
size_t read_wait_nfdset;
@@ -415,8 +412,7 @@
if ((gaierr = getaddrinfo(host, strport, &hints, &aitop)) != 0)
fatal("getaddrinfo %s: %s", host, ssh_gai_strerror(gaierr));
for (ai = aitop; ai; ai = ai->ai_next) {
- s = socket_rdomain(ai->ai_family, ai->ai_socktype,
- ai->ai_protocol, scan_rdomain);
+ s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (s < 0) {
error("socket: %s", strerror(errno));
continue;
@@ -719,7 +715,7 @@
{
fprintf(stderr,
"usage: %s [-46Hv] [-f file] [-p port] [-T timeout] [-t type]\n"
- "\t\t [-V rdomain] [host | addrlist namelist] ...\n",
+ "\t\t [host | addrlist namelist] ...\n",
__progname);
exit(1);
}
@@ -745,7 +741,7 @@
if (argc <= 1)
usage();
- while ((opt = getopt(argc, argv, "Hv46p:T:t:f:V:")) != -1) {
+ while ((opt = getopt(argc, argv, "Hv46p:T:t:f:")) != -1) {
switch (opt) {
case 'H':
hash_hosts = 1;
@@ -806,13 +802,6 @@
case '6':
IPv4or6 = AF_INET6;
break;
- case 'V':
- scan_rdomain = a2rdomain(optarg);
- if (scan_rdomain == -1) {
- fprintf(stderr, "Bad rdomain '%s'\n", optarg);
- exit(1);
- }
- break;
case '?':
default:
usage();