lib/active_samba_ldap/configuration.rb in activesambaldap-0.0.2 vs lib/active_samba_ldap/configuration.rb in activesambaldap-0.0.3

@@ -46,10 +46,19 @@
           end
           super(name)
         end
       end
 
+      def remove_connection_related_configuration(config)
+        target_keys = Private::VARIABLES.collect do |name|
+          name.to_sym
+        end - ActiveLdap::Adapter::Base::VALID_ADAPTER_CONFIGURATION_KEYS
+        super(config).reject do |key, value|
+          target_keys.include?(key)
+        end
+      end
+
       def merge_configuration(config)
         config = config.symbolize_keys
         config = (configurations["common"] || {}).symbolize_keys.merge(config)
         ValidHash.new.merge(super(Private.new(config).merge))
       end
@@ -218,16 +227,16 @@
         def start_gid
           10000
         end
 
         def default_user_gid
-          rid = ActiveSambaLdap::SambaGroup::DOMAIN_USERS_RID
-          ActiveSambaLdap::SambaGroup.rid2gid(rid)
+          rid = ActiveSambaLdap::Group::DOMAIN_USERS_RID
+          ActiveSambaLdap::Group.rid2gid(rid)
         end
 
         def default_computer_gid
-          rid = ActiveSambaLdap::SambaGroup::DOMAIN_COMPUTERS_RID
-          ActiveSambaLdap::SambaGroup.rid2gid(rid)
+          rid = ActiveSambaLdap::Group::DOMAIN_COMPUTERS_RID
+          ActiveSambaLdap::Group.rid2gid(rid)
         end
 
         def skeleton_directory
           "/etc/skel"
         end