#

# This patch is to add a new DisableBanner option to the ssh client command,

# which allows the ssh command to disable the display of the banner message.

# We have contributed back this feature to the OpenSSH upstream community. For

# more information, see https://bugzilla.mindrot.org/show_bug.cgi?id=2242.

# In the future, if this feature is accepted by the upsteam in a later release,

# we will remove this patch when we upgrade to that release.  

#

 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,

 	oSendEnv, oControlPath, oControlMaster, oControlPersist,

 	oHashKnownHosts,

+#ifdef DISABLE_BANNER 

+#endif

 	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,

 	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,

 	{ "controlmaster", oControlMaster },

 	{ "controlpersist", oControlPersist },

 	{ "hashknownhosts", oHashKnownHosts },

+#ifdef DISABLE_BANNER

+#endif

 	{ "tunnel", oTunnel },

 	{ "tunneldevice", oTunnelDevice },

 	{ NULL, -1 }

 };

+#ifdef DISABLE_BANNER

+static const struct multistate multistate_disablebanner[] = {

+}; 

+#endif

+

 /*

  * Processes a single option line as used in the configuration files. This

  * only sets those values that have not already been set.

+#ifdef DISABLE_BANNER

+                multistate_ptr = multistate_disablebanner;

+                goto parse_multistate; 

+#endif

+

 	case oDeprecated:

 		debug("%s line %d: Deprecated option \"%s\"",

 		    filename, linenum, keyword);

 	options->ip_qos_bulk = -1;

 	options->request_tty = -1;

 	options->proxy_use_fdpass = -1;

+#ifdef DISABLE_BANNER

+#endif

 	options->ignored_unknown = NULL;

 	options->num_canonical_domains = 0;

 	options->num_permitted_cnames = 0;

 		options->canonicalize_fallback_local = 1;

 	if (options->canonicalize_hostname == -1)

 		options->canonicalize_hostname = SSH_CANONICALISE_NO;

+#ifdef DISABLE_BANNER

+#endif

 	if (options->fingerprint_hash == -1)

 		options->fingerprint_hash = SSH_FP_HASH_DEFAULT;

 	if (options->update_hostkeys == -1)

 	char	*ignored_unknown; /* Pattern list of unknown tokens to ignore */

+#ifdef DISABLE_BANNER

+        int     disable_banner; /* Disable display of banner */

+#endif

 }       Options;

 #define SSH_CANONICALISE_NO	0

 #define SSH_UPDATE_HOSTKEYS_YES	1

 #define SSH_UPDATE_HOSTKEYS_ASK	2

+#ifdef DISABLE_BANNER

+#endif

+

 void     initialize_options(Options *);

 void     fill_default_options(Options *);

 void	 fill_default_options_for_canonicalization(Options *);

 then the backgrounded master connection will automatically terminate

 after it has remained idle (with no client connections) for the

 specified time.

+.It Cm DisableBanner

+If set to yes, disables the display of the  banner  message.

+If set to in-exec-mode, disables the display of banner message when in remote 

+command mode only.

+.Pp

+The default value is no, which means that the banner is displayed unless the 

+log level  is  QUIET, FATAL, or ERROR. See also the Banner option in

 .It Cm DynamicForward

 Specifies that a TCP port on the local machine be forwarded

 over the secure channel, and the application

 extern char *server_version_string;

 extern Options options;

+#ifdef DISABLE_BANNER

+extern Buffer command;

+#endif

+

 /*

  * SSH2 key exchange

  */

 	lang = packet_get_string(NULL);

+

+#ifdef DISABLE_BANNER

+            (options.disable_banner == SSH_DISABLEBANNER_NO ||

+            (options.disable_banner == SSH_DISABLEBANNER_INEXECMODE &&

+#else

+#endif