components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch
branchs11u3-sru
changeset 4935 ed3830c87e7b
parent 4401 85f919ec3274
child 5324 5683175b6e99
--- a/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch	Fri Aug 07 07:58:06 2015 -0700
+++ b/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch	Mon Aug 03 15:31:47 2015 -0700
@@ -20,7 +20,7 @@
  /* $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,29 @@
+@@ -528,6 +527,30 @@
          { "pamserviceprefix", sPAMServicePrefix, SSHCFG_GLOBAL },
          { "pamservicename", sPAMServiceName, SSHCFG_GLOBAL },
  #endif
@@ -45,6 +45,7 @@
 +	{ "trustedanchorkeystore", sDeprecated, SSHCFG_GLOBAL },
 +	{ "useunsupportedsshv1", sDeprecated, SSHCFG_GLOBAL },
 +	{ "usefips140", sDeprecated, SSHCFG_ALL},
++	{ "gssapistoredelegatedcredentials", sDeprecated, SSHCFG_ALL },
 +	{ "gssapikeyexchange", sDeprecated, SSHCFG_ALL},
 +#endif
  	{ NULL, sBadOption, 0 }