--- a/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch Thu Jan 14 09:14:14 2016 +0100
+++ b/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch Mon Jan 25 10:57:40 2016 -0800
@@ -13,16 +13,28 @@
# This is a Solaris specific change to ease the transition and will not be
# offered upstream.
#
---- orig/servconf.c Mon Jun 1 15:37:53 2015
-+++ new/servconf.c Mon Jun 1 15:43:35 2015
-@@ -1,4 +1,3 @@
--
- /* $OpenBSD: servconf.c,v 1.248 2013/12/06 13:39:49 markus Exp $ */
- /*
- * Copyright (c) 1995 Tatu Ylonen <[email protected]>, Espoo, Finland
-@@ -528,6 +527,30 @@
- { "pamserviceprefix", sPAMServicePrefix, SSHCFG_GLOBAL },
- { "pamservicename", sPAMServiceName, SSHCFG_GLOBAL },
+diff -pur old/servconf.c new/servconf.c
+--- old/servconf.c
++++ new/servconf.c
+@@ -518,6 +518,7 @@ static struct {
+ { "afstokenpassing", sUnsupported, SSHCFG_GLOBAL },
+ #ifdef GSSAPI
+ { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
++ { "gssauthentication", sGssAuthentication, SSHCFG_ALL }, /* alias */
+ #ifdef USE_GSS_STORE_CRED
+ { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
+ #else /* USE_GSS_STORE_CRED */
+@@ -526,6 +527,7 @@ static struct {
+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
+ #else
+ { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
++ { "gssauthentication", sUnsupported, SSHCFG_ALL }, /* alias */
+ { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
+ #endif
+@@ -592,6 +594,30 @@ static struct {
+ { "pamserviceprefix", sPAMServicePrefix, SSHCFG_GLOBAL },
+ { "pamservicename", sPAMServiceName, SSHCFG_GLOBAL },
#endif
+#ifdef DEPRECATE_SUNSSH_OPT
+ /*
@@ -46,8 +58,8 @@
+ { "useunsupportedsshv1", sDeprecated, SSHCFG_GLOBAL },
+ { "usefips140", sDeprecated, SSHCFG_ALL},
+ { "gssapistoredelegatedcredentials", sDeprecated, SSHCFG_ALL },
-+ { "gssapikeyexchange", sDeprecated, SSHCFG_ALL},
++ { "gssstoredelegcreds", sDeprecated, SSHCFG_ALL },
+#endif
- { NULL, sBadOption, 0 }
- };
-
+ { "revokedkeys", sRevokedKeys, SSHCFG_ALL },
+ { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
+ { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },