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

Merge pull request #5805 from cisco87/patch-1 

Use the extended password parameter, more compatible
This commit is contained in:
Seth Vargo 2015-06-10 09:14:51 -04:00
parent 72fe7d045d c66df8cd2c
commit 6a926793d9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/guests/linux/cap/mount_smb_shared_folder.rb
View File

@ -33,7 +33,7 @@ module VagrantPlugins
options[:mount_options] ||= [] options[:mount_options] ||= []
options[:mount_options] << "sec=ntlm" options[:mount_options] << "sec=ntlm"
options[:mount_options] << "username=#{username}" options[:mount_options] << "username=#{username}"
options[:mount_options] << "pass=#{smb_password}" options[:mount_options] << "password=#{smb_password}"
options[:mount_options] << "domain=#{domain}" if domain options[:mount_options] << "domain=#{domain}" if domain
# First mount command uses getent to get the group # First mount command uses getent to get the group

4
test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb
View File

@ -18,7 +18,7 @@ describe "VagrantPlugins::GuestLinux::Cap::MountSharedFolder" do
describe ".mount_shared_folder" do describe ".mount_shared_folder" do
describe "with a domain" do describe "with a domain" do
let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group | cut -d: -f3`,sec=ntlm,username=user,pass=pass,domain=domain //host/name " } let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group | cut -d: -f3`,sec=ntlm,username=user,password=pass,domain=domain //host/name " }
before do before do
communicator.expect_command mount_command communicator.expect_command mount_command
communicator.stub_command mount_command, exit_code: 0 communicator.stub_command mount_command, exit_code: 0
@ -29,7 +29,7 @@ describe "VagrantPlugins::GuestLinux::Cap::MountSharedFolder" do
end end
end end
describe "without a domain" do describe "without a domain" do
let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group | cut -d: -f3`,sec=ntlm,username=user,pass=pass //host/name " } let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group | cut -d: -f3`,sec=ntlm,username=user,password=pass //host/name " }
before do before do
communicator.expect_command mount_command communicator.expect_command mount_command
communicator.stub_command mount_command, exit_code: 0 communicator.stub_command mount_command, exit_code: 0