Add the VersionAddendum configuration variable.
Sponsored by: DARPA, NAI Labs
This commit is contained in:
parent
edb557f8bb
commit
db58a8e40c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=99047
@ -299,6 +299,7 @@ typedef enum {
|
||||
sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
|
||||
sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
|
||||
sUsePrivilegeSeparation,
|
||||
sVersionAddendum,
|
||||
sDeprecated
|
||||
} ServerOpCodes;
|
||||
|
||||
@ -376,6 +377,7 @@ static struct {
|
||||
{ "authorizedkeysfile", sAuthorizedKeysFile },
|
||||
{ "authorizedkeysfile2", sAuthorizedKeysFile2 },
|
||||
{ "useprivilegeseparation", sUsePrivilegeSeparation},
|
||||
{ "versionaddendum", sVersionAddendum },
|
||||
{ NULL, sBadOption }
|
||||
};
|
||||
|
||||
@ -899,6 +901,13 @@ process_server_config_line(ServerOptions *options, char *line,
|
||||
intptr = &options->client_alive_count_max;
|
||||
goto parse_int;
|
||||
|
||||
case sVersionAddendum:
|
||||
ssh_version_set_addendum(strtok(cp, "\n"));
|
||||
do {
|
||||
arg = strdelim(&cp);
|
||||
} while (arg != NULL && *arg != '\0');
|
||||
break;
|
||||
|
||||
case sDeprecated:
|
||||
log("%s line %d: Deprecated option %s",
|
||||
filename, linenum, arg);
|
||||
|
@ -57,3 +57,62 @@ ssh_version_set_addendum(const char *add) {
|
||||
xfree(version);
|
||||
version = newvers;
|
||||
}
|
||||
/*-
|
||||
* 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,13 @@
|
||||
/* $OpenBSD: version.h,v 1.33 2002/06/21 15:41:20 markus Exp $ */
|
||||
/* $FreeBSD$ */
|
||||
|
||||
#define SSH_VERSION "OpenSSH_3.3"
|
||||
#ifndef SSH_VERSION
|
||||
|
||||
#define SSH_VERSION (ssh_version_get())
|
||||
#define SSH_VERSION_BASE "OpenSSH_3.3"
|
||||
#define SSH_VERSION_ADDENDUM "FreeBSD-20020625"
|
||||
|
||||
const char *ssh_version_get(void);
|
||||
void ssh_version_set_addendum(const char *add);
|
||||
#endif /* SSH_VERSION */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user