mirror of git://anongit.mindrot.org/openssh.git
- (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]
Remove hacks add for RoutingDomain in preparation for its removal.
This commit is contained in:
Darren Tucker
parent
269275c90c
commit
8c65f646a9
|
|
@ -1,3 +1,7 @@
|
|||
20091210
|
||||
- (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]
|
||||
Remove hacks add for RoutingDomain in preparation for its removal.
|
||||
|
||||
20091209
|
||||
- (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
|
||||
have it.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: configure.ac,v 1.433 2010/01/08 08:53:52 dtucker Exp $
|
||||
# $Id: configure.ac,v 1.434 2010/01/09 23:26:58 dtucker Exp $
|
||||
#
|
||||
# Copyright (c) 1999-2004 Damien Miller
|
||||
#
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
|
||||
AC_REVISION($Revision: 1.433 $)
|
||||
AC_REVISION($Revision: 1.434 $)
|
||||
AC_CONFIG_SRCDIR([ssh.c])
|
||||
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
|
@ -1623,11 +1623,6 @@ if test "x$ac_cv_func_getpeereid" != "xyes" -a "x$ac_cv_func_getpeerucred" != "x
|
|||
)
|
||||
fi
|
||||
|
||||
AC_CHECK_DECL(SO_RDOMAIN,
|
||||
AC_DEFINE(USE_ROUTINGDOMAIN, 1, [Enable rdomain/VRF support]), ,
|
||||
[#include <sys/types.h>
|
||||
#include <sys/socket.h>])
|
||||
|
||||
dnl see whether mkstemp() requires XXXXXX
|
||||
if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
|
||||
AC_MSG_CHECKING([for (overly) strict mkstemp])
|
||||
|
|
|
|||
6
misc.c
6
misc.c
|
|
@ -164,13 +164,10 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
|
|||
return (sock);
|
||||
|
||||
switch (domain) {
|
||||
#ifdef IPPROTO_IPV6
|
||||
case AF_INET6:
|
||||
ipproto = IPPROTO_IPV6;
|
||||
/* FALLTHROUGH */
|
||||
#endif
|
||||
case AF_INET:
|
||||
#ifdef USE_ROUTINGDOMAIN
|
||||
debug2("socket %d af %d setting rdomain %d",
|
||||
sock, domain, rdomain);
|
||||
if (setsockopt(sock, ipproto, SO_RDOMAIN, &rdomain,
|
||||
|
|
@ -180,7 +177,6 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
|
|||
close(sock);
|
||||
return (-1);
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
default:
|
||||
debug("socket %d af %d does not support rdomain %d",
|
||||
|
|
@ -277,7 +273,6 @@ a2port(const char *s)
|
|||
return (int)port;
|
||||
}
|
||||
|
||||
#ifdef USE_ROUTINGDOMAIN
|
||||
int
|
||||
a2rdomain(const char *s)
|
||||
{
|
||||
|
|
@ -289,7 +284,6 @@ a2rdomain(const char *s)
|
|||
return -1;
|
||||
return (int)rdomain;
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
a2tun(const char *s, int *remote)
|
||||
|
|
|
|||
|
|
@ -229,11 +229,7 @@ static struct {
|
|||
{ "permitlocalcommand", oPermitLocalCommand },
|
||||
{ "visualhostkey", oVisualHostKey },
|
||||
{ "useroaming", oUseRoaming },
|
||||
#ifdef USE_ROUTINGDOMAIN
|
||||
{ "routingdomain", oRDomain },
|
||||
#else
|
||||
{ "routingdomain", oUnsupported },
|
||||
#endif
|
||||
#ifdef JPAKE
|
||||
{ "zeroknowledgepasswordauthentication",
|
||||
oZeroKnowledgePasswordAuthentication },
|
||||
|
|
@ -924,7 +920,6 @@ parse_int:
|
|||
intptr = &options->use_roaming;
|
||||
goto parse_flag;
|
||||
|
||||
#ifdef USE_ROUTINGDOMAIN
|
||||
case oRDomain:
|
||||
arg = strdelim(&s);
|
||||
if (!arg || *arg == '\0')
|
||||
|
|
@ -937,7 +932,6 @@ parse_int:
|
|||
if (*activep)
|
||||
options->rdomain = value;
|
||||
break;
|
||||
#endif
|
||||
|
||||
case oDeprecated:
|
||||
debug("%s line %d: Deprecated option \"%s\"",
|
||||
|
|
|
|||
|
|
@ -424,11 +424,7 @@ static struct {
|
|||
{ "match", sMatch, SSHCFG_ALL },
|
||||
{ "permitopen", sPermitOpen, SSHCFG_ALL },
|
||||
{ "forcecommand", sForceCommand, SSHCFG_ALL },
|
||||
#ifdef USE_ROUTINGDOMAIN
|
||||
{ "routingdomain", sRDomain, SSHCFG_GLOBAL },
|
||||
#else
|
||||
{ "routingdomain", sUnsupported, SSHCFG_GLOBAL },
|
||||
#endif
|
||||
{ "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
|
||||
{ NULL, sBadOption, 0 }
|
||||
};
|
||||
|
|
@ -1300,7 +1296,6 @@ process_server_config_line(ServerOptions *options, char *line,
|
|||
*charptr = xstrdup(arg);
|
||||
break;
|
||||
|
||||
#ifdef USE_ROUTINGDOMAIN
|
||||
case sRDomain:
|
||||
intptr = &options->rdomain;
|
||||
arg = strdelim(&cp);
|
||||
|
|
@ -1313,7 +1308,6 @@ process_server_config_line(ServerOptions *options, char *line,
|
|||
if (*intptr == -1)
|
||||
*intptr = value;
|
||||
break;
|
||||
#endif
|
||||
|
||||
case sDeprecated:
|
||||
logit("%s line %d: Deprecated option %s",
|
||||
|
|
|
|||
|
|
@ -807,17 +807,11 @@ main(int argc, char **argv)
|
|||
IPv4or6 = AF_INET6;
|
||||
break;
|
||||
case 'V':
|
||||
#ifdef USE_ROUTINGDOMAIN
|
||||
scan_rdomain = a2rdomain(optarg);
|
||||
if (scan_rdomain == -1) {
|
||||
fprintf(stderr, "Bad rdomain '%s'\n", optarg);
|
||||
exit(1);
|
||||
}
|
||||
#else
|
||||
fprintf(stderr, "RoutingDomain not supported on this "
|
||||
"platform.\n");
|
||||
exit(1);
|
||||
#endif
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
|
|
|
|||
Loading…
Reference in New Issue