summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac9
-rw-r--r--misc.c6
-rw-r--r--readconf.c6
-rw-r--r--servconf.c6
-rw-r--r--ssh-keyscan.c6
6 files changed, 6 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 6700f308e..e38cd5108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120091210
2 - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]
3 Remove hacks add for RoutingDomain in preparation for its removal.
4
120091209 520091209
2 - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't 6 - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
3 have it. 7 have it.
diff --git a/configure.ac b/configure.ac
index 424114015..e6e6259bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.433 2010/01/08 08:53:52 dtucker Exp $ 1# $Id: configure.ac,v 1.434 2010/01/09 23:26:58 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.433 $) 18AC_REVISION($Revision: 1.434 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -1623,11 +1623,6 @@ if test "x$ac_cv_func_getpeereid" != "xyes" -a "x$ac_cv_func_getpeerucred" != "x
1623 ) 1623 )
1624fi 1624fi
1625 1625
1626AC_CHECK_DECL(SO_RDOMAIN,
1627 AC_DEFINE(USE_ROUTINGDOMAIN, 1, [Enable rdomain/VRF support]), ,
1628 [#include <sys/types.h>
1629 #include <sys/socket.h>])
1630
1631dnl see whether mkstemp() requires XXXXXX 1626dnl see whether mkstemp() requires XXXXXX
1632if test "x$ac_cv_func_mkdtemp" = "xyes" ; then 1627if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
1633AC_MSG_CHECKING([for (overly) strict mkstemp]) 1628AC_MSG_CHECKING([for (overly) strict mkstemp])
diff --git a/misc.c b/misc.c
index b260d89fe..550b03cad 100644
--- a/misc.c
+++ b/misc.c
@@ -164,13 +164,10 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
164 return (sock); 164 return (sock);
165 165
166 switch (domain) { 166 switch (domain) {
167#ifdef IPPROTO_IPV6
168 case AF_INET6: 167 case AF_INET6:
169 ipproto = IPPROTO_IPV6; 168 ipproto = IPPROTO_IPV6;
170 /* FALLTHROUGH */ 169 /* FALLTHROUGH */
171#endif
172 case AF_INET: 170 case AF_INET:
173#ifdef USE_ROUTINGDOMAIN
174 debug2("socket %d af %d setting rdomain %d", 171 debug2("socket %d af %d setting rdomain %d",
175 sock, domain, rdomain); 172 sock, domain, rdomain);
176 if (setsockopt(sock, ipproto, SO_RDOMAIN, &rdomain, 173 if (setsockopt(sock, ipproto, SO_RDOMAIN, &rdomain,
@@ -180,7 +177,6 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
180 close(sock); 177 close(sock);
181 return (-1); 178 return (-1);
182 } 179 }
183#endif
184 break; 180 break;
185 default: 181 default:
186 debug("socket %d af %d does not support rdomain %d", 182 debug("socket %d af %d does not support rdomain %d",
@@ -277,7 +273,6 @@ a2port(const char *s)
277 return (int)port; 273 return (int)port;
278} 274}
279 275
280#ifdef USE_ROUTINGDOMAIN
281int 276int
282a2rdomain(const char *s) 277a2rdomain(const char *s)
283{ 278{
@@ -289,7 +284,6 @@ a2rdomain(const char *s)
289 return -1; 284 return -1;
290 return (int)rdomain; 285 return (int)rdomain;
291} 286}
292#endif
293 287
294int 288int
295a2tun(const char *s, int *remote) 289a2tun(const char *s, int *remote)
diff --git a/readconf.c b/readconf.c
index 47c77472a..40fe8f694 100644
--- a/readconf.c
+++ b/readconf.c
@@ -229,11 +229,7 @@ static struct {
229 { "permitlocalcommand", oPermitLocalCommand }, 229 { "permitlocalcommand", oPermitLocalCommand },
230 { "visualhostkey", oVisualHostKey }, 230 { "visualhostkey", oVisualHostKey },
231 { "useroaming", oUseRoaming }, 231 { "useroaming", oUseRoaming },
232#ifdef USE_ROUTINGDOMAIN
233 { "routingdomain", oRDomain }, 232 { "routingdomain", oRDomain },
234#else
235 { "routingdomain", oUnsupported },
236#endif
237#ifdef JPAKE 233#ifdef JPAKE
238 { "zeroknowledgepasswordauthentication", 234 { "zeroknowledgepasswordauthentication",
239 oZeroKnowledgePasswordAuthentication }, 235 oZeroKnowledgePasswordAuthentication },
@@ -924,7 +920,6 @@ parse_int:
924 intptr = &options->use_roaming; 920 intptr = &options->use_roaming;
925 goto parse_flag; 921 goto parse_flag;
926 922
927#ifdef USE_ROUTINGDOMAIN
928 case oRDomain: 923 case oRDomain:
929 arg = strdelim(&s); 924 arg = strdelim(&s);
930 if (!arg || *arg == '\0') 925 if (!arg || *arg == '\0')
@@ -937,7 +932,6 @@ parse_int:
937 if (*activep) 932 if (*activep)
938 options->rdomain = value; 933 options->rdomain = value;
939 break; 934 break;
940#endif
941 935
942 case oDeprecated: 936 case oDeprecated:
943 debug("%s line %d: Deprecated option \"%s\"", 937 debug("%s line %d: Deprecated option \"%s\"",
diff --git a/servconf.c b/servconf.c
index 9ad08ce87..2cdc480e6 100644
--- a/servconf.c
+++ b/servconf.c
@@ -424,11 +424,7 @@ static struct {
424 { "match", sMatch, SSHCFG_ALL }, 424 { "match", sMatch, SSHCFG_ALL },
425 { "permitopen", sPermitOpen, SSHCFG_ALL }, 425 { "permitopen", sPermitOpen, SSHCFG_ALL },
426 { "forcecommand", sForceCommand, SSHCFG_ALL }, 426 { "forcecommand", sForceCommand, SSHCFG_ALL },
427#ifdef USE_ROUTINGDOMAIN
428 { "routingdomain", sRDomain, SSHCFG_GLOBAL }, 427 { "routingdomain", sRDomain, SSHCFG_GLOBAL },
429#else
430 { "routingdomain", sUnsupported, SSHCFG_GLOBAL },
431#endif
432 { "chrootdirectory", sChrootDirectory, SSHCFG_ALL }, 428 { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
433 { NULL, sBadOption, 0 } 429 { NULL, sBadOption, 0 }
434}; 430};
@@ -1300,7 +1296,6 @@ process_server_config_line(ServerOptions *options, char *line,
1300 *charptr = xstrdup(arg); 1296 *charptr = xstrdup(arg);
1301 break; 1297 break;
1302 1298
1303#ifdef USE_ROUTINGDOMAIN
1304 case sRDomain: 1299 case sRDomain:
1305 intptr = &options->rdomain; 1300 intptr = &options->rdomain;
1306 arg = strdelim(&cp); 1301 arg = strdelim(&cp);
@@ -1313,7 +1308,6 @@ process_server_config_line(ServerOptions *options, char *line,
1313 if (*intptr == -1) 1308 if (*intptr == -1)
1314 *intptr = value; 1309 *intptr = value;
1315 break; 1310 break;
1316#endif
1317 1311
1318 case sDeprecated: 1312 case sDeprecated:
1319 logit("%s line %d: Deprecated option %s", 1313 logit("%s line %d: Deprecated option %s",
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 086c0d345..faeb9e13e 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -807,17 +807,11 @@ main(int argc, char **argv)
807 IPv4or6 = AF_INET6; 807 IPv4or6 = AF_INET6;
808 break; 808 break;
809 case 'V': 809 case 'V':
810#ifdef USE_ROUTINGDOMAIN
811 scan_rdomain = a2rdomain(optarg); 810 scan_rdomain = a2rdomain(optarg);
812 if (scan_rdomain == -1) { 811 if (scan_rdomain == -1) {
813 fprintf(stderr, "Bad rdomain '%s'\n", optarg); 812 fprintf(stderr, "Bad rdomain '%s'\n", optarg);
814 exit(1); 813 exit(1);
815 } 814 }
816#else
817 fprintf(stderr, "RoutingDomain not supported on this "
818 "platform.\n");
819 exit(1);
820#endif
821 break; 815 break;
822 case '?': 816 case '?':
823 default: 817 default: