Add DebianBanner server configuration option

Setting this to "no" causes sshd to omit the Debian revision from its
initial protocol handshake, for those scared by package-versioning.patch.

Bug-Debian: http://bugs.debian.org/562048
Forwarded: not-needed
Last-Update: 2015-11-29

Patch-Name: debian-banner.patch

1 files changed, 9 insertions, 0 deletions

diff --git a/servconf.c b/servconf.c
index ca73f7c55..a391cf4b2 100644
--- a/servconf.c
+++ b/servconf.c
@@ -166,6 +166,7 @@ initialize_server_options(ServerOptions *options)
         options->version_addendum = NULL;
         options->fingerprint_hash = -1;
         options->disable_forwarding = -1;
+        options->debian_banner = -1;
 }
 
 /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
@@ -339,6 +340,8 @@ fill_default_server_options(ServerOptions *options)
                 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
         if (options->disable_forwarding == -1)
                 options->disable_forwarding = 0;
+        if (options->debian_banner == -1)
+                options->debian_banner = 1;
 
         assemble_algorithms(options);
 
@@ -425,6 +428,7 @@ typedef enum {
         sAuthenticationMethods, sHostKeyAgent, sPermitUserRC,
         sStreamLocalBindMask, sStreamLocalBindUnlink,
         sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
+        sDebianBanner,
         sDeprecated, sIgnore, sUnsupported
 } ServerOpCodes;
 
@@ -577,6 +581,7 @@ static struct {
         { "allowstreamlocalforwarding", sAllowStreamLocalForwarding, SSHCFG_ALL },
         { "fingerprinthash", sFingerprintHash, SSHCFG_GLOBAL },
         { "disableforwarding", sDisableForwarding, SSHCFG_ALL },
+        { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
         { NULL, sBadOption, 0 }
 };
 
@@ -1866,6 +1871,10 @@ process_server_config_line(ServerOptions *options, char *line,
                         options->fingerprint_hash = value;
                 break;
 
+        case sDebianBanner:
+                intptr = &options->debian_banner;
+                goto parse_int;
+
         case sDeprecated:
         case sIgnore:
         case sUnsupported: