author | Tomas Kuthan <tomas.kuthan@oracle.com> |
Tue, 30 Dec 2014 12:58:06 -0800 | |
changeset 3574 | 80e9a4e240d3 |
parent 1924 | 72ec8810274b |
child 5027 | c71f34180df2 |
permissions | -rw-r--r-- |
1612
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1 |
# |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
2 |
# To make the transition from SunSSH to OpenSSH as smooth as possible, we |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
3 |
# added SunSSH-only options as deprecated options in OpenSSH. Note that this |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
4 |
# is an interim enhancement to OpenSSH to make the transition smoother. If a |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
5 |
# deprecated SunSSH-only option is migrated to OpenSSH later, then it will be |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
6 |
# changed from deprecated to supported. Since this is for Solaris only, we will |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
7 |
# not contribute back this change to the upstream community. |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
8 |
# |
3574
80e9a4e240d3
PSARC/2014/390 OpenSSH GSSKEY
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
1924
diff
changeset
|
9 |
--- old/readconf.c 2014-01-17 05:03:57.000000000 -0800 |
80e9a4e240d3
PSARC/2014/390 OpenSSH GSSKEY
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
1924
diff
changeset
|
10 |
+++ new/readconf.c 2014-11-22 04:15:00.066981692 -0800 |
80e9a4e240d3
PSARC/2014/390 OpenSSH GSSKEY
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
1924
diff
changeset
|
11 |
@@ -268,6 +268,24 @@ static struct { |
1796
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
12 |
{ "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
13 |
{ "ignoreunknown", oIgnoreUnknown }, |
1924
72ec8810274b
18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1796
diff
changeset
|
14 |
|
1612
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
15 |
+#ifdef DEPRECATE_SUNSSH_OPT |
1796
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
16 |
+ /* |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
17 |
+ * On Solaris, to make the transition from SunSSH to OpenSSH as smooth |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
18 |
+ * as possible, we will deprecate SunSSH-only options in OpenSSH. |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
19 |
+ * Therefore, on a system that is running OpenSSH with a deprecated |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
20 |
+ * option from the user's config file (~/.ssh/config), the ssh |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
21 |
+ * connection will proceed without the deprecated option. Note that |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
22 |
+ * this is an interim enhancement to OpenSSH to make the transition |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
23 |
+ * smoother. If a deprecated SunSSH-only option is migrated to OpenSSH |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
24 |
+ * later, then it will be changed from deprecated to supported. |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
25 |
+ */ |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
26 |
+ { "kmfpolicydatabase", oDeprecated }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
27 |
+ { "kmfpolicyname", oDeprecated }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
28 |
+ { "trustedanchorkeystore", oDeprecated }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
29 |
+ { "usefips140", oDeprecated }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
30 |
+ { "useopensslengine", oDeprecated }, |
1612
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
31 |
+#endif |
1924
72ec8810274b
18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1796
diff
changeset
|
32 |
+ |
1612
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
33 |
{ NULL, oBadOption } |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
34 |
}; |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
35 |