From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 2 Jun 2021 16:21:45 +0000 (+0100)
Subject: otter cli: ssh keys: avoid creating account and then bailing
X-Git-Tag: otter-0.7.0~111
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ea0d75e5d9dd18c65820c945e030d59b9e68e0da;p=otter.git

otter cli: ssh keys: avoid creating account and then bailing

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

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 46706a35..85422e06 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -2025,6 +2025,11 @@ mod set_ssh_keys {
   fn call(SCCA{ ma, args,.. }:SCCA) {
     let args = parse_args::<Args,_>(args, &subargs, &ok_id, None);
     let mut conn = connect(&ma)?;
+
+    if ! ma.account.subaccount.is_empty() {
+      throw!(ME::NoSshKeysForSubaccount);
+    }
+
     conn.prep_access_account(&ma, false)?;
 
     use sshkeys::*;