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 76f5e43d667e814d26dc1bdd09addffe7abc1c0d..ce56b9f80715fa273566924be64137e37f9764b0 100644 (file)
--- 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 4cece82f4dee14ff95ab1ad223ecdfda827a811f..e91ecc2c8d6391674129ba9683f9f0f826fdaaf5 100644 (file)
--- 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 5682a0fd0c55fbc8f3ee181bda189e0808142b8e..a4a5692e149c46a5c58e858db7d25915032dcc20 100644 (file)
--- 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(