summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-07-16 10:28:35 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-07-16 10:28:35 +0200
commite946dc963a8143d3ea0f3c176bb35178e606ed54 (patch)
tree515595a11573235c99dbcfdf9dd74aa0f8c2d988
parent17189aded7adc6643290839ee462436f2501cb1f (diff)
parent0ea0759130ffb236a4bccf387e5a3d91a5411f49 (diff)
downloadmullvadvpn-e946dc963a8143d3ea0f3c176bb35178e606ed54.tar.xz
mullvadvpn-e946dc963a8143d3ea0f3c176bb35178e606ed54.zip
Merge branch 'fix-cli-panic'
-rw-r--r--CHANGELOG.md4
-rw-r--r--mullvad-cli/src/cmds/bridge.rs1
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f754dd9955..16206cad94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,10 @@ Line wrap the file at 100 chars. Th
- Add new settings page for generating and verifying wireguard keys.
+### Fixed
+- Mark CLI `bridge set state` argument as required to avoid a crash.
+
+
## [2019.6] - 2019-07-15
### Added
- Add simplified Chinese translations.
diff --git a/mullvad-cli/src/cmds/bridge.rs b/mullvad-cli/src/cmds/bridge.rs
index 8d8a942264..caee182123 100644
--- a/mullvad-cli/src/cmds/bridge.rs
+++ b/mullvad-cli/src/cmds/bridge.rs
@@ -138,6 +138,7 @@ fn create_set_state_subcommand() -> clap::App<'static, 'static> {
.arg(
clap::Arg::with_name("state")
.help("Specifies whether a bridge should be used")
+ .required(true)
.index(1)
.possible_values(&["auto", "on", "off"]),
)