SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last fixes and improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-06-07 21:20:56 +00:00
parent 4b78db449c
commit bf0676207f
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
2406 changed files with 6353 additions and 434004 deletions
Download patch file Download diff file Expand all files Collapse all files

11
usr.bin/ssh/servconf.c
View file

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.392 2023/03/05 05:34:09 dtucker Exp $ */
/* $OpenBSD: servconf.c,v 1.394 2023/06/05 13:24:36 millert Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@ -908,7 +908,7 @@ process_permitopen(struct ssh *ssh, ServerOptions *options)
/* Parse a ChannelTimeout clause "pattern=interval" */
static int
parse_timeout(const char *s, char **typep, u_int *secsp)
parse_timeout(const char *s, char **typep, int *secsp)
{
char *cp, *sdup;
int secs;
@ -934,7 +934,7 @@ parse_timeout(const char *s, char **typep, u_int *secsp)
if (typep != NULL)
*typep = xstrdup(sdup);
if (secsp != NULL)
*secsp = (u_int)secs;
*secsp = secs;
free(sdup);
return 0;
}
@ -942,7 +942,8 @@ parse_timeout(const char *s, char **typep, u_int *secsp)
void
process_channel_timeouts(struct ssh *ssh, ServerOptions *options)
{
u_int i, secs;
int secs;
u_int i;
char *type;
debug3_f("setting %u timeouts", options->num_channel_timeouts);
@ -2346,7 +2347,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
fatal("%.200s line %d: %s must be an absolute path",
filename, linenum, keyword);
}
if (*activep && options->authorized_keys_command == NULL)
if (*activep && *charptr == NULL)
*charptr = xstrdup(str + len);
argv_consume(&ac);
break;