summaryrefslogtreecommitdiffstats
path: root/readconf.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-08 09:53:52 +0100
committerDarren Tucker <dtucker@zip.com.au>2010-01-08 09:53:52 +0100
commit1f5e3dc274fe4616435ff451b5216b5bde217c0d (patch)
tree345cdb5f89e533e8871de0b8527b6cb45cbf9d46 /readconf.c
parent - (dtucker) [sftp.c] ifdef out the sftp completion bits for platforms that (diff)
downloadopenssh-1f5e3dc274fe4616435ff451b5216b5bde217c0d.tar.xz
openssh-1f5e3dc274fe4616435ff451b5216b5bde217c0d.zip
- (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] Make
RoutingDomain an unsupported option on platforms that don't have it.
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/readconf.c b/readconf.c
index 40fe8f694..47c77472a 100644
--- a/readconf.c
+++ b/readconf.c
@@ -229,7 +229,11 @@ static struct {
{ "permitlocalcommand", oPermitLocalCommand },
{ "visualhostkey", oVisualHostKey },
{ "useroaming", oUseRoaming },
+#ifdef USE_ROUTINGDOMAIN
{ "routingdomain", oRDomain },
+#else
+ { "routingdomain", oUnsupported },
+#endif
#ifdef JPAKE
{ "zeroknowledgepasswordauthentication",
oZeroKnowledgePasswordAuthentication },
@@ -920,6 +924,7 @@ parse_int:
intptr = &options->use_roaming;
goto parse_flag;
+#ifdef USE_ROUTINGDOMAIN
case oRDomain:
arg = strdelim(&s);
if (!arg || *arg == '\0')
@@ -932,6 +937,7 @@ parse_int:
if (*activep)
options->rdomain = value;
break;
+#endif
case oDeprecated:
debug("%s line %d: Deprecated option \"%s\"",