From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 1 Jun 2021 01:47:07 +0000 (+0100)
Subject: otter cli: Do not SelectAccount when we are mgmtchannel-proxy
X-Git-Tag: otter-0.7.0~158
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c50f853574bd62d7694f09d377aaf91f3e3338e6;p=otter.git

otter cli: Do not SelectAccount when we are mgmtchannel-proxy

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 8a98a349..f4e5fb47 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -1927,14 +1927,14 @@ mod mgmtchannel_proxy {
   #[throws(AE)]
   fn call(_sc: &Subcommand, ma: MainOpts, args: Vec<String>) {
     let args = parse_args::<Args,_>(args, &subargs, &ok_id, None);
-    let mut conn = connect(&ma)?;
+    let mut chan = connect_chan(&ma)?;
 
     if let Some(ref restrict) = args.restrict {
-      conn.cmd(&MC::SetRestrictedSshScope { key: restrict.clone() })
+      chan.cmd(&MC::SetRestrictedSshScope { key: restrict.clone() })
         .context("specify authorisation")?;
     }
 
-    let Conn { chan: MgmtChannel { read, write, .. }, .. } = conn;
+    let MgmtChannel { read, write } = chan;
     let mut read = read.into_stream()?;
     let mut write = write.into_stream()?;