haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Retain winssh_ method prefix on auth key helper

This commit is contained in:
Chris Roberts 2017-08-21 14:48:52 -07:00
parent 7fac854cf3
commit 93f6451261
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/guests/windows/cap/public_key.rb
View File

@ -7,7 +7,7 @@ module VagrantPlugins
def self.insert_public_key(machine, contents) def self.insert_public_key(machine, contents)
if machine.communicate.is_a?(CommunicatorWinSSH::Communicator) if machine.communicate.is_a?(CommunicatorWinSSH::Communicator)
contents = contents.strip contents = contents.strip
modify_authorized_keys machine do |keys| winssh_modify_authorized_keys machine do |keys|
if !keys.include?(contents) if !keys.include?(contents)
keys << contents keys << contents
end end
@ -19,7 +19,7 @@ module VagrantPlugins
def self.remove_public_key(machine, contents) def self.remove_public_key(machine, contents)
if machine.communicate.is_a?(CommunicatorWinSSH::Communicator) if machine.communicate.is_a?(CommunicatorWinSSH::Communicator)
modify_authorized_keys machine do |keys| winssh_modify_authorized_keys machine do |keys|
keys.delete(contents) keys.delete(contents)
end end
else else
@ -27,7 +27,7 @@ module VagrantPlugins
end end
end end
def self.modify_authorized_keys(machine) def self.winssh_modify_authorized_keys(machine)
comm = machine.communicate comm = machine.communicate
directories = fetch_guest_paths(comm) directories = fetch_guest_paths(comm)
home_dir = directories[:home] home_dir = directories[:home]