mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 09:10:28 +00:00
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
This commit is contained in:
parent
1f5ce8f412
commit
933ca70f8f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=76227
|
@ -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 @@ read_server_config(ServerOptions *options, const char *filename)
|
|||
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);
|
||||
|
|
59
crypto/openssh/version.c
Normal file
59
crypto/openssh/version.c
Normal file
|
@ -0,0 +1,59 @@
|
|||
/*-
|
||||
* Copyright (c) 2001 Brian Fundakowski Feldman
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
#include "version.h"
|
||||
#include "xmalloc.h"
|
||||
|
||||
RCSID("$FreeBSD$");
|
||||
|
||||
static char *version = NULL;
|
||||
|
||||
const char *
|
||||
ssh_version_get(void) {
|
||||
|
||||
if (version == NULL)
|
||||
version = xstrdup(SSH_VERSION_BASE " " SSH_VERSION_ADDENDUM);
|
||||
return (version);
|
||||
}
|
||||
|
||||
void
|
||||
ssh_version_set_addendum(const char *add) {
|
||||
char *newvers;
|
||||
size_t size;
|
||||
|
||||
if (add != NULL) {
|
||||
size = strlen(SSH_VERSION_BASE) + 1 + strlen(add) + 1;
|
||||
newvers = xmalloc(size);
|
||||
snprintf(newvers, size, "%s %s", SSH_VERSION_BASE, add);
|
||||
} else {
|
||||
newvers = xstrdup(SSH_VERSION_BASE);
|
||||
}
|
||||
if (version != NULL)
|
||||
xfree(version);
|
||||
version = newvers;
|
||||
}
|
|
@ -1,4 +1,12 @@
|
|||
/* $FreeBSD$ */
|
||||
/* $OpenBSD: version.h,v 1.13 2000/10/16 09:38:45 djm Exp $ */
|
||||
|
||||
#define SSH_VERSION "OpenSSH_2.3.0 green@FreeBSD.org 20010319"
|
||||
#ifndef SSH_VERSION
|
||||
|
||||
#define SSH_VERSION (ssh_version_get())
|
||||
#define SSH_VERSION_BASE "OpenSSH_2.3.0"
|
||||
#define SSH_VERSION_ADDENDUM "green@FreeBSD.org 20010319"
|
||||
|
||||
const char *ssh_version_get(void);
|
||||
void ssh_version_set_addendum(const char *add);
|
||||
#endif /* SSH_VERSION */
|
||||
|
|
Loading…
Reference in a new issue