diff --git a/lib/vmpooler/api/helpers.rb b/lib/vmpooler/api/helpers.rb index aeed4ce..6d0cbe6 100644 --- a/lib/vmpooler/api/helpers.rb +++ b/lib/vmpooler/api/helpers.rb @@ -79,38 +79,38 @@ module Vmpooler def authenticate(auth, username_str, password_str) case auth['provider'] - when 'dummy' - return (username_str != password_str) - when 'ldap' - ldap_base = auth[:ldap]['base'] - ldap_port = auth[:ldap]['port'] || 389 + when 'dummy' + return (username_str != password_str) + when 'ldap' + ldap_base = auth[:ldap]['base'] + ldap_port = auth[:ldap]['port'] || 389 - if ldap_base.is_a? Array - ldap_base.each do |search_base| - result = authenticate_ldap( - ldap_port, - auth[:ldap]['host'], - auth[:ldap]['user_object'], - search_base, - username_str, - password_str - ) - return true if result == true - end - else + if ldap_base.is_a? Array + ldap_base.each do |search_base| result = authenticate_ldap( ldap_port, auth[:ldap]['host'], auth[:ldap]['user_object'], - ldap_base, + search_base, username_str, password_str ) - return result + return true if result == true end - - return false + else + result = authenticate_ldap( + ldap_port, + auth[:ldap]['host'], + auth[:ldap]['user_object'], + ldap_base, + username_str, + password_str + ) + return result end + + return false + end end def export_tags(backend, hostname, tags) diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index 05957f3..6337863 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -267,7 +267,7 @@ module Vmpooler if pool_index.include? poolname unless pools[pool_index[poolname]]['clone_target'] == clone_target pools[pool_index[poolname]]['clone_target'] == clone_target - end + end end end end