diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-01-08 19:53:52 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-01-08 19:53:52 +1100 |
commit | 1f5e3dc274fe4616435ff451b5216b5bde217c0d (patch) | |
tree | 345cdb5f89e533e8871de0b8527b6cb45cbf9d46 /readconf.c | |
parent | e67f7db968e376c9971dd3a4d4ab3fae4a06bf78 (diff) |
- (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.c | 6 |
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 { | |||
229 | { "permitlocalcommand", oPermitLocalCommand }, | 229 | { "permitlocalcommand", oPermitLocalCommand }, |
230 | { "visualhostkey", oVisualHostKey }, | 230 | { "visualhostkey", oVisualHostKey }, |
231 | { "useroaming", oUseRoaming }, | 231 | { "useroaming", oUseRoaming }, |
232 | #ifdef USE_ROUTINGDOMAIN | ||
232 | { "routingdomain", oRDomain }, | 233 | { "routingdomain", oRDomain }, |
234 | #else | ||
235 | { "routingdomain", oUnsupported }, | ||
236 | #endif | ||
233 | #ifdef JPAKE | 237 | #ifdef JPAKE |
234 | { "zeroknowledgepasswordauthentication", | 238 | { "zeroknowledgepasswordauthentication", |
235 | oZeroKnowledgePasswordAuthentication }, | 239 | oZeroKnowledgePasswordAuthentication }, |
@@ -920,6 +924,7 @@ parse_int: | |||
920 | intptr = &options->use_roaming; | 924 | intptr = &options->use_roaming; |
921 | goto parse_flag; | 925 | goto parse_flag; |
922 | 926 | ||
927 | #ifdef USE_ROUTINGDOMAIN | ||
923 | case oRDomain: | 928 | case oRDomain: |
924 | arg = strdelim(&s); | 929 | arg = strdelim(&s); |
925 | if (!arg || *arg == '\0') | 930 | if (!arg || *arg == '\0') |
@@ -932,6 +937,7 @@ parse_int: | |||
932 | if (*activep) | 937 | if (*activep) |
933 | options->rdomain = value; | 938 | options->rdomain = value; |
934 | break; | 939 | break; |
940 | #endif | ||
935 | 941 | ||
936 | case oDeprecated: | 942 | case oDeprecated: |
937 | debug("%s line %d: Deprecated option \"%s\"", | 943 | debug("%s line %d: Deprecated option \"%s\"", |