From 288f8ba5527fdfb36444da170ac895cf2d014e52 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Wed, 18 Oct 2023 17:44:18 -0700 Subject: [PATCH] Update path check for ssl helper 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. --- lib/vagrant.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/vagrant.rb b/lib/vagrant.rb index ad860e393..1faeb8be0 100644 --- a/lib/vagrant.rb +++ b/lib/vagrant.rb @@ -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"