version 1.208, 2013/10/16 02:31:45 |
version 1.209, 2013/10/16 22:49:38 |
|
|
oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, |
oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, |
oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, |
oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, |
oCanonicalDomains, oCanonicaliseHostname, oCanonicaliseMaxDots, |
oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, |
oCanonicaliseFallbackLocal, oCanonicalisePermittedCNAMEs, |
oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, |
oIgnoredUnknownOption, oDeprecated, oUnsupported |
oIgnoredUnknownOption, oDeprecated, oUnsupported |
} OpCodes; |
} OpCodes; |
|
|
|
|
{ "requesttty", oRequestTTY }, |
{ "requesttty", oRequestTTY }, |
{ "proxyusefdpass", oProxyUseFdpass }, |
{ "proxyusefdpass", oProxyUseFdpass }, |
{ "canonicaldomains", oCanonicalDomains }, |
{ "canonicaldomains", oCanonicalDomains }, |
{ "canonicalisefallbacklocal", oCanonicaliseFallbackLocal }, |
{ "canonicalizefallbacklocal", oCanonicalizeFallbackLocal }, |
{ "canonicalisehostname", oCanonicaliseHostname }, |
{ "canonicalizehostname", oCanonicalizeHostname }, |
{ "canonicalisemaxdots", oCanonicaliseMaxDots }, |
{ "canonicalizemaxdots", oCanonicalizeMaxDots }, |
{ "canonicalisepermittedcnames", oCanonicalisePermittedCNAMEs }, |
{ "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs }, |
{ "ignoreunknown", oIgnoreUnknown }, |
{ "ignoreunknown", oIgnoreUnknown }, |
|
|
{ NULL, oBadOption } |
{ NULL, oBadOption } |
|
|
{ "auto", REQUEST_TTY_AUTO }, |
{ "auto", REQUEST_TTY_AUTO }, |
{ NULL, -1 } |
{ NULL, -1 } |
}; |
}; |
static const struct multistate multistate_canonicalisehostname[] = { |
static const struct multistate multistate_canonicalizehostname[] = { |
{ "true", SSH_CANONICALISE_YES }, |
{ "true", SSH_CANONICALISE_YES }, |
{ "false", SSH_CANONICALISE_NO }, |
{ "false", SSH_CANONICALISE_NO }, |
{ "yes", SSH_CANONICALISE_YES }, |
{ "yes", SSH_CANONICALISE_YES }, |
|
|
} |
} |
break; |
break; |
|
|
case oCanonicalisePermittedCNAMEs: |
case oCanonicalizePermittedCNAMEs: |
value = options->num_permitted_cnames != 0; |
value = options->num_permitted_cnames != 0; |
while ((arg = strdelim(&s)) != NULL && *arg != '\0') { |
while ((arg = strdelim(&s)) != NULL && *arg != '\0') { |
/* Either '*' for everything or 'list:list' */ |
/* Either '*' for everything or 'list:list' */ |
|
|
} |
} |
break; |
break; |
|
|
case oCanonicaliseHostname: |
case oCanonicalizeHostname: |
intptr = &options->canonicalise_hostname; |
intptr = &options->canonicalize_hostname; |
multistate_ptr = multistate_canonicalisehostname; |
multistate_ptr = multistate_canonicalizehostname; |
goto parse_multistate; |
goto parse_multistate; |
|
|
case oCanonicaliseMaxDots: |
case oCanonicalizeMaxDots: |
intptr = &options->canonicalise_max_dots; |
intptr = &options->canonicalize_max_dots; |
goto parse_int; |
goto parse_int; |
|
|
case oCanonicaliseFallbackLocal: |
case oCanonicalizeFallbackLocal: |
intptr = &options->canonicalise_fallback_local; |
intptr = &options->canonicalize_fallback_local; |
goto parse_flag; |
goto parse_flag; |
|
|
case oDeprecated: |
case oDeprecated: |
|
|
options->ignored_unknown = NULL; |
options->ignored_unknown = NULL; |
options->num_canonical_domains = 0; |
options->num_canonical_domains = 0; |
options->num_permitted_cnames = 0; |
options->num_permitted_cnames = 0; |
options->canonicalise_max_dots = -1; |
options->canonicalize_max_dots = -1; |
options->canonicalise_fallback_local = -1; |
options->canonicalize_fallback_local = -1; |
options->canonicalise_hostname = -1; |
options->canonicalize_hostname = -1; |
} |
} |
|
|
/* |
/* |
|
|
options->request_tty = REQUEST_TTY_AUTO; |
options->request_tty = REQUEST_TTY_AUTO; |
if (options->proxy_use_fdpass == -1) |
if (options->proxy_use_fdpass == -1) |
options->proxy_use_fdpass = 0; |
options->proxy_use_fdpass = 0; |
if (options->canonicalise_max_dots == -1) |
if (options->canonicalize_max_dots == -1) |
options->canonicalise_max_dots = 1; |
options->canonicalize_max_dots = 1; |
if (options->canonicalise_fallback_local == -1) |
if (options->canonicalize_fallback_local == -1) |
options->canonicalise_fallback_local = 1; |
options->canonicalize_fallback_local = 1; |
if (options->canonicalise_hostname == -1) |
if (options->canonicalize_hostname == -1) |
options->canonicalise_hostname = SSH_CANONICALISE_NO; |
options->canonicalize_hostname = SSH_CANONICALISE_NO; |
#define CLEAR_ON_NONE(v) \ |
#define CLEAR_ON_NONE(v) \ |
do { \ |
do { \ |
if (v != NULL && strcasecmp(v, "none") == 0) { \ |
if (v != NULL && strcasecmp(v, "none") == 0) { \ |