[Ovirt-devel] [PATCH server 4/8] Switch from old connection style to current.

[Jason Guiditta]

establish_connetion has been deprecated, so switch to
setup_connection.

Signed-off-by: Jason Guiditta <jason.guiditta at gmail.com>
---
 src/app/helpers/ldap_connection.rb     |    2 +-
 src/script/grant_admin_privileges      |    2 +-
 src/vendor/plugins/active_ldap/init.rb |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/helpers/ldap_connection.rb b/src/app/helpers/ldap_connection.rb
index af8b41b..b8cb0e3 100644
--- a/src/app/helpers/ldap_connection.rb
+++ b/src/app/helpers/ldap_connection.rb
@@ -31,7 +31,7 @@ class LDAPConnection
     host = @@config[ENV['RAILS_ENV']]["host"] if host == nil
     port = @@config[ENV['RAILS_ENV']]["port"] if port == nil
 
-    ActiveLdap::Base.establish_connection(:host => host,
+    ActiveLdap::Base.setup_connection(:host => host,
 					  :port => port,
 					  :base => base) if LDAPConnection.connected? == false
   end
diff --git a/src/script/grant_admin_privileges b/src/script/grant_admin_privileges
index cdf36e7..a0e340a 100755
--- a/src/script/grant_admin_privileges
+++ b/src/script/grant_admin_privileges
@@ -9,7 +9,7 @@ ldap_config = YAML::load(File.open(File.dirname(__FILE__) +"/../config/ldap.yml"
 uid = ARGV[0]
 base, host = ldap_config["production"]["base"], ldap_config["production"]["host"]
 
-ActiveLdap::Base.establish_connection :base => base, :host => host, :try_sasl => false
+ActiveLdap::Base.setup_connection :base => base, :host => host, :try_sasl => false
 
 if Account.exists?("uid=#{uid}")
   puts "Creating an admin account for #{uid}..."
diff --git a/src/vendor/plugins/active_ldap/init.rb b/src/vendor/plugins/active_ldap/init.rb
index 3b4291e..e8395cf 100644
--- a/src/vendor/plugins/active_ldap/init.rb
+++ b/src/vendor/plugins/active_ldap/init.rb
@@ -13,7 +13,7 @@ ldap_configuration_file = File.join(RAILS_ROOT, 'config', 'ldap.yml')
 if File.exist?(ldap_configuration_file)
   configurations = YAML.load(ERB.new(IO.read(ldap_configuration_file)).result)
   ActiveLdap::Base.configurations = configurations
-  ActiveLdap::Base.establish_connection
+  ActiveLdap::Base.setup_connection
 else
   ActiveLdap::Base.class_eval do
     format = _("You should run 'script/generator scaffold_active_ldap' to make %s.")
-- 
1.6.2.5