Add a "VersionAddendum" configuration setting for sshd which allows

anyone to easily change the part of the OpenSSH version after the main
version number.  The FreeBSD-specific version banner could be disabled
that way, for example:

# Call ourselves plain OpenSSH
VersionAddendum

1 files changed, 9 insertions, 1 deletions

diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index 5f3213e..bbc4367 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -223,7 +223,7 @@ typedef enum {
 	sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups,
 	sIgnoreUserKnownHosts, sHostDSAKeyFile, sCiphers, sProtocol, sPidFile,
 	sGatewayPorts, sDSAAuthentication, sConnectionsPerPeriod, sXAuthLocation,
-	sSubsystem, sMaxStartups
+	sSubsystem, sMaxStartups, sVersionAddendum
 } ServerOpCodes;
 
 /* Textual representation of the tokens. */
@@ -288,6 +288,7 @@ static struct {
 	{ "connectionsperperiod", sConnectionsPerPeriod },
 	{ "subsystem", sSubsystem },
 	{ "maxstartups", sMaxStartups },
+	{ "versionaddendum", sVersionAddendum },
 	{ NULL, 0 }
 };
 
@@ -736,6 +737,13 @@ parse_flag:
 			intptr = &options->max_startups;
 			goto parse_int;
 
+		case sVersionAddendum:
+			ssh_version_set_addendum(strtok(cp, "\n"));
+			do
+				arg = strdelim(&cp);
+			while (arg != NULL && *arg != '\0');
+			break;
+
 		default:
 			fatal("%.200s line %d: Missing handler for opcode %s (%d)\n",
 				filename, linenum,arg, opcode);