components/openssh/patches/008-deprecate_sunssh_opt.patch
author Huie-Ying Lee <huieying.lee@oracle.com>
Fri, 30 May 2014 10:34:34 -0700
changeset 1924 72ec8810274b
parent 1796 a2310ec32635
child 3574 80e9a4e240d3
permissions -rw-r--r--
18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
#
1924
72ec8810274b 18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1796
diff changeset
     9
--- orig/readconf.c	Fri May 23 09:56:00 2014
72ec8810274b 18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1796
diff changeset
    10
+++ new/readconf.c	Fri May 23 09:59:57 2014
72ec8810274b 18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1796
diff changeset
    11
@@ -268,6 +268,25 @@
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
+        { "gssapikeyexchange", oDeprecated },
a2310ec32635 PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1612
diff changeset
    27
+        { "kmfpolicydatabase", oDeprecated },
a2310ec32635 PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1612
diff changeset
    28
+        { "kmfpolicyname", oDeprecated },
a2310ec32635 PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1612
diff changeset
    29
+        { "trustedanchorkeystore", oDeprecated },
a2310ec32635 PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1612
diff changeset
    30
+        { "usefips140", oDeprecated },
a2310ec32635 PSARC 2014/078 OpenSSH 6.5
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1612
diff changeset
    31
+        { "useopensslengine", oDeprecated },
1612
3f2ec017627f PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff changeset
    32
+#endif
1924
72ec8810274b 18828925 migrate the disablebanner feature from SunSSH to OpenSSH
Huie-Ying Lee <huieying.lee@oracle.com>
parents: 1796
diff changeset
    33
+
1612
3f2ec017627f PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff changeset
    34
 	{ NULL, oBadOption }
3f2ec017627f PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff changeset
    35
 };
3f2ec017627f PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff changeset
    36