upstream/vagrant
1
0
Fork 0
mirror of https://github.com/hashicorp/vagrant.git synced 2026-06-10 01:00:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update path check for ssl helper

Browse source 
A path check is done prior to loading the vagrant ssl helper, but it was
only checking for a file with a `.so` suffix so `.bundle` files on macos
would be ignored and the helper not loaded.

Include both paths when checking for the library existence.
This commit is contained in:
Chris Roberts 2023-10-18 17:44:18 -07:00
parent b8f9efb0d2
commit 288f8ba552
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/vagrant.rb
View file

@ -129,7 +129,11 @@ end
# If the vagrant_ssl library exists, a recent version
# of openssl is in use and its needed to load all the
# providers needed
if File.exist?(File.expand_path("vagrant/vagrant_ssl.so", __dir__))
vagrant_ssl_locations = [
File.expand_path("vagrant/vagrant_ssl.so", __dir__),
File.expand_path("vagrant/vagrant_ssl.bundle", __dir__)
]
if vagrant_ssl_locations.any? { |f| File.exist?(f) }
global_logger.debug("vagrant ssl helper found for loading ssl providers")
begin
require "vagrant/vagrant_ssl"