1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
$NetBSD: patch-bd,v 1.1 1999/12/25 05:28:37 kim Exp $
--- readconf.c.orig Wed May 12 07:19:27 1999
+++ readconf.c Fri Dec 24 21:50:42 1999
@@ -170,7 +170,13 @@
oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
oBatchMode, oStrictHostKeyChecking, oCompression, oCompressionLevel,
oKeepAlives, oUsePrivilegedPort, oKerberosAuthentication,
+#ifdef AFS
+ oAFSTokenPassing,
+#endif /* AFS */
oKerberosTgtPassing, oClearAllForwardings, oNumberOfPasswordPrompts,
+#ifdef ENABLE_ANOTHER_PORT_TRY
+ oAnotherPort,
+#endif /* ENABLE_ANOTHER_PORT_TRY */
oXauthPath, oGatewayPorts, oPasswordPromptLogin, oPasswordPromptHost
} OpCodes;
@@ -194,6 +200,9 @@
{ "hostname", oHostName },
{ "proxycommand", oProxyCommand },
{ "port", oPort },
+#ifdef ENABLE_ANOTHER_PORT_TRY
+ { "anotherport", oAnotherPort },
+#endif /* ENABLE_ANOTHER_PORT_TRY */
{ "cipher", oCipher },
{ "remoteforward", oRemoteForward },
{ "localforward", oLocalForward },
@@ -213,6 +222,9 @@
{ "useprivilegedport", oUsePrivilegedPort },
{ "kerberosauthentication", oKerberosAuthentication },
{ "kerberostgtpassing", oKerberosTgtPassing },
+#ifdef AFS
+ { "afstokenpassing", oAFSTokenPassing },
+#endif /* AFS */
{ "clearallforwardings", oClearAllForwardings },
{ "numberofpasswordprompts", oNumberOfPasswordPrompts },
{ "xauthlocation", oXauthPath },
@@ -354,6 +366,12 @@
intptr = &options->kerberos_tgt_passing;
goto parse_flag;
+#ifdef AFS
+ case oAFSTokenPassing:
+ intptr = &options->afs_token_passing;
+ goto parse_flag;
+#endif /* AFS */
+
case oFallBackToRsh:
intptr = &options->fallback_to_rsh;
goto parse_flag;
@@ -497,6 +515,12 @@
*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;
@@ -678,6 +702,9 @@
options->rsa_authentication = -1;
options->kerberos_authentication = -1;
options->kerberos_tgt_passing = -1;
+#ifdef AFS
+ options->afs_token_passing = -1;
+#endif /* AFS */
options->tis_authentication = -1;
options->password_authentication = -1;
options->rhosts_rsa_authentication = -1;
@@ -689,6 +716,9 @@
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;
@@ -724,17 +754,19 @@
if (options->rsa_authentication == -1)
options->rsa_authentication = 1;
if (options->kerberos_authentication == -1)
-#if defined(KERBEROS) && defined(KRB5)
+#if defined(KRB4) || defined(KRB5)
options->kerberos_authentication = 1;
-#else /* defined(KERBEROS) && defined(KRB5) */
+#else
options->kerberos_authentication = 0;
-#endif /* defined(KERBEROS) && defined(KRB5) */
+#endif /* defined(KRB4) || defined(KRB5) */
if (options->kerberos_tgt_passing == -1)
-#if defined(KERBEROS_TGT_PASSING) && defined(KRB5)
+#if defined(AFS)
options->kerberos_tgt_passing = 1;
-#else /* defined(KERBEROS_TGT_PASSING) && defined(KRB5) */
+ if (options->afs_token_passing == -1)
+ options->afs_token_passing = 1;
+#else
options->kerberos_tgt_passing = 0;
-#endif /* defined(KERBEROS_TGT_PASSING) && defined(KRB5) */
+#endif /* AFS */
if (options->tis_authentication == -1)
options->tis_authentication = 0;
if (options->password_authentication == -1)
@@ -759,6 +791,10 @@
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)
|