diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-06-08 07:02:46 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-06-08 17:12:52 +1000 |
| commit | d786424986c04d1d375f231fda177c8408e05c3e (patch) | |
| tree | 718f0f862bd6a8d9630fb5cc9e1db04714f795c7 /readconf.c | |
| parent | aae4b4d3585b9f944d7dbd3c9e5ba0006c55e457 (diff) | |
| download | openssh-git-d786424986c04d1d375f231fda177c8408e05c3e.tar.gz | |
upstream: Check if IPQoS or TunnelDevice are already set before
overriding. Prevents values in config files from overriding values supplied
on the command line. bz#3319, ok markus.
OpenBSD-Commit-ID: f3b08b898c324debb9195e6865d8999406938f74
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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; } |