lib/active_samba_ldap/configuration.rb in activesambaldap-0.0.4 vs lib/active_samba_ldap/configuration.rb in activesambaldap-0.0.5

@@ -55,13 +55,13 @@
         super(config).reject do |key, value|
           target_keys.include?(key)
         end
       end
 
-      def merge_configuration(config)
+      def merge_configuration(config, *rest)
         config = config.symbolize_keys
         config = (configurations["common"] || {}).symbolize_keys.merge(config)
-        ValidHash.new.merge(super(Private.new(config).merge))
+        ValidHash.new.merge(super(Private.new(config).merge, *rest))
       end
 
       def required_configuration_variables(*names)
         config = configuration
         if config.nil?