mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-27 05:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

upstream: Check if IPQoS or TunnelDevice are already set before

Browse Source 
overriding. Prevents values in config files from overriding values supplied
on the command line.  bz#3319, ok markus.

OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74
This commit is contained in:
dtucker@openbsd.org 2021-06-08 07:02:46 +00:00 committed by Damien Miller
parent aae4b4d358
commit d786424986
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.354 2021/05/23 18:22:57 naddy Exp $ */
/* $OpenBSD: readconf.c,v 1.355 2021/06/08 07:02:46 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1742,7 +1742,7 @@ parse_pubkey_algos:
filename, linenum);
return -1;
}
if (*activep) {
if (*activep && options->tun_local == -1) {
options->tun_local = value;
options->tun_remote = value2;
}
@ -1850,7 +1850,7 @@ parse_pubkey_algos:
filename, linenum, arg);
return -1;
}
if (*activep) {
if (*activep && options->ip_qos_interactive == -1) {
options->ip_qos_interactive = value;
options->ip_qos_bulk = value2;
}