eb66565459
The IPv6 patch was obtained from the kame repository and has been
been writen by KIKUCHI Takahiro <kick@kyoto.wide.ad.jp>
Due to the whole mess with different patches it was necessary to include
both the IPv6 patch and patch-ssh-1.2.27-bsd.tty.chown in ${PATCHDIR}.
Since both patches modify the configure script it was also necessary
to rebuild it via autoconf from configure.in. I've decided to use
USE_AUTOCONF instead of including the re-build configure script in
${FILESDIR}
Obtained from: KAME/WIDE
67 lines
2.0 KiB
Plaintext
67 lines
2.0 KiB
Plaintext
*** readconf.c.orig Wed May 12 13:19:27 1999
|
|
--- readconf.c Mon Jan 10 22:56:13 2000
|
|
***************
|
|
*** 171,176 ****
|
|
--- 171,179 ----
|
|
oBatchMode, oStrictHostKeyChecking, oCompression, oCompressionLevel,
|
|
oKeepAlives, oUsePrivilegedPort, oKerberosAuthentication,
|
|
oKerberosTgtPassing, oClearAllForwardings, oNumberOfPasswordPrompts,
|
|
+ #ifdef ENABLE_ANOTHER_PORT_TRY
|
|
+ oAnotherPort,
|
|
+ #endif /* ENABLE_ANOTHER_PORT_TRY */
|
|
oXauthPath, oGatewayPorts, oPasswordPromptLogin, oPasswordPromptHost
|
|
} OpCodes;
|
|
|
|
***************
|
|
*** 194,199 ****
|
|
--- 197,205 ----
|
|
{ "hostname", oHostName },
|
|
{ "proxycommand", oProxyCommand },
|
|
{ "port", oPort },
|
|
+ #ifdef ENABLE_ANOTHER_PORT_TRY
|
|
+ { "anotherport", oAnotherPort },
|
|
+ #endif /* ENABLE_ANOTHER_PORT_TRY */
|
|
{ "cipher", oCipher },
|
|
{ "remoteforward", oRemoteForward },
|
|
{ "localforward", oLocalForward },
|
|
***************
|
|
*** 497,502 ****
|
|
--- 503,514 ----
|
|
*intptr = value;
|
|
break;
|
|
|
|
+ #ifdef ENABLE_ANOTHER_PORT_TRY
|
|
+ case oAnotherPort:
|
|
+ intptr = &options->another_port;
|
|
+ goto parse_int;
|
|
+ #endif /* ENABLE_ANOTHER_PORT_TRY */
|
|
+
|
|
case oConnectionAttempts:
|
|
intptr = &options->connection_attempts;
|
|
goto parse_int;
|
|
***************
|
|
*** 689,694 ****
|
|
--- 701,709 ----
|
|
options->keepalives = -1;
|
|
options->compression_level = -1;
|
|
options->port = -1;
|
|
+ #ifdef ENABLE_ANOTHER_PORT_TRY
|
|
+ options->another_port = -1;
|
|
+ #endif /* ENABLE_ANOTHER_PORT_TRY */
|
|
options->connection_attempts = -1;
|
|
options->number_of_password_prompts = -1;
|
|
options->password_prompt_login = -1;
|
|
***************
|
|
*** 759,764 ****
|
|
--- 774,783 ----
|
|
options->compression_level = 6;
|
|
if (options->port == -1)
|
|
options->port = 0; /* Filled in ssh_connect. */
|
|
+ #ifdef ENABLE_ANOTHER_PORT_TRY
|
|
+ if (options->another_port == -1)
|
|
+ options->another_port = 0;
|
|
+ #endif /* ENABLE_ANOTHER_PORT_TRY */
|
|
if (options->connection_attempts == -1)
|
|
options->connection_attempts = 4;
|
|
if (options->number_of_password_prompts == -1)
|