From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 May 2021 19:57:27 +0000 (+0100)
Subject: sshkeys: Rename MR::SshKeyAdded
X-Git-Tag: otter-0.7.0~208
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8eefe55fcc8d081f908eab38768959b7adaa58f7;p=otter.git

sshkeys: Rename MR::SshKeyAdded

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 76f5e43d..ce56b9f8 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -445,7 +445,7 @@ fn execute_and_respond<W>(cs: &mut CommandStreamData, cmd: MgmtCommand,
     MC::SshAddKey { akl } => {
       let (mut ag, acctid, auth) = start_access_ssh_keys(&cs)?;
       let (index, id) = ag.sshkeys_add(acctid, akl, auth)?;
-      MR::SshKey { index, id }
+      MR::SshKeyAdded { index, id }
     }
     MC::SshDeleteKey { index, id } => {
       let (mut ag, acctid, auth) = start_access_ssh_keys(&cs)?;
diff --git a/src/commands.rs b/src/commands.rs
index 4cece82f..e91ecc2c 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -103,7 +103,7 @@ pub enum MgmtResponse {
   Bundles { bundles: MgmtBundleList },
   Bundle { bundle: bundles::Id },
   SshKeys(Vec<sshkeys::MgmtKeyReport>),
-  SshKey { index: usize, id: sshkeys::Id },
+  SshKeyAdded { index: usize, id: sshkeys::Id },
 }
 
 pub type MgmtBundleList = BTreeMap<bundles::Id, bundles::State>;
diff --git a/src/mgmtchannel.rs b/src/mgmtchannel.rs
index 5682a0fd..a4a5692e 100644
--- a/src/mgmtchannel.rs
+++ b/src/mgmtchannel.rs
@@ -114,7 +114,7 @@ impl MgmtChannel {
       Progress(_) => panic!(),
       Fine | AccountsList{..} | GamesList{..} |
       Libraries(_) | LibraryItems(_) | Bundles{..} | Bundle{..} => { },
-      SshKeys(..) | SshKey{..} => { },
+      SshKeys(..) | SshKeyAdded{..} => { },
       AlterGame { error: None, .. } => { },
       Error { error } => {
         Err(error.clone()).context(