author | Jan Parcel <jan.parcel@oracle.com> |
Mon, 01 Feb 2016 06:53:50 -0800 | |
changeset 5376 | 4615bc2f4a50 |
parent 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 |
# |
5027
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
9 |
diff -pur old/readconf.c new/readconf.c |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
10 |
--- old/readconf.c |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
11 |
+++ new/readconf.c |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
12 |
@@ -192,10 +192,14 @@ static struct { |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
13 |
{ "afstokenpassing", oUnsupported }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
14 |
#if defined(GSSAPI) |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
15 |
{ "gssapiauthentication", oGssAuthentication }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
16 |
+ { "gssauthentication", oGssAuthentication }, /* alias */ |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
17 |
{ "gssapidelegatecredentials", oGssDelegateCreds }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
18 |
+ { "gssdelegatecreds", oGssDelegateCreds }, /* alias */ |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
19 |
#else |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
20 |
{ "gssapiauthentication", oUnsupported }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
21 |
+ { "gssauthentication", oUnsupported }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
22 |
{ "gssapidelegatecredentials", oUnsupported }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
23 |
+ { "gssdelegatecreds", oUnsupported }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
24 |
#endif |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
25 |
{ "fallbacktorsh", oDeprecated }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
26 |
{ "usersh", oDeprecated }, |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
27 |
@@ -279,6 +283,24 @@ static struct { |
c71f34180df2
PSARC/2015/427 Old SunSSH Gss* Option Names in OpenSSH
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
3574
diff
changeset
|
28 |
{ "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes }, |
1796
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
29 |
{ "ignoreunknown", oIgnoreUnknown }, |
1924
72ec8810274b
18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1796
diff
changeset
|
30 |
|
1612
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
31 |
+#ifdef DEPRECATE_SUNSSH_OPT |
1796
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
32 |
+ /* |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
33 |
+ * 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
|
34 |
+ * 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
|
35 |
+ * 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
|
36 |
+ * 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
|
37 |
+ * 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
|
38 |
+ * 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
|
39 |
+ * 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
|
40 |
+ * 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
|
41 |
+ */ |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
42 |
+ { "kmfpolicydatabase", oDeprecated }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
43 |
+ { "kmfpolicyname", oDeprecated }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
44 |
+ { "trustedanchorkeystore", oDeprecated }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
45 |
+ { "usefips140", oDeprecated }, |
a2310ec32635
PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1612
diff
changeset
|
46 |
+ { "useopensslengine", oDeprecated }, |
1612
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
47 |
+#endif |
1924
72ec8810274b
18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
1796
diff
changeset
|
48 |
+ |
1612
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
49 |
{ NULL, oBadOption } |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
50 |
}; |
3f2ec017627f
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
51 |