[asl-commit] ActiveSambaLdap (trunk) r125:

[null at cozmixng.org]

retro	2007-09-16 22:50:27 +0900 (Sun, 16 Sep 2007)

  New Revision: 125

  Modified files:
    trunk/bin/asl-passwd
    trunk/lib/active_samba_ldap.rb
    trunk/lib/active_samba_ldap/configuration.rb
    trunk/test/asl-test-utils.rb
    trunk/test/run-test.rb

  Log:


  Modified: trunk/test/asl-test-utils.rb (+1 -1)
===================================================================
--- trunk/test/asl-test-utils.rb	2007-09-16 22:29:35 +09:00 (rev 124)
+++ trunk/test/asl-test-utils.rb	2007-09-16 22:50:27 +09:00 (rev 125)
@@ -246,7 +246,7 @@
       @lib_dir = File.join(@top_dir, "lib")
       @ruby_args = [
                     "-I", @lib_dir,
-#                     "-I", File.join(@parent_dir, "activeldap", "lib"),
+                    "-I", File.join(@parent_dir, "activeldap", "lib"),
 #                     "-I", File.join(@parent_dir, "ldap", "lib"),
 #                     "-I", File.join(@parent_dir, "ldap"),
                  ]

  Modified: trunk/lib/active_samba_ldap.rb (+1 -1)
===================================================================
--- trunk/lib/active_samba_ldap.rb	2007-09-16 22:29:35 +09:00 (rev 124)
+++ trunk/lib/active_samba_ldap.rb	2007-09-16 22:50:27 +09:00 (rev 125)
@@ -8,7 +8,7 @@
   end
 end
 
-required_active_ldap_version = ">= 0.8.3.1"
+required_active_ldap_version = ">= 0.8.4"
 require_gem_if_need.call("active_ldap", "ruby-activeldap",
                          required_active_ldap_version)
 

  Modified: trunk/test/run-test.rb (+1 -1)
===================================================================
--- trunk/test/run-test.rb	2007-09-16 22:29:35 +09:00 (rev 124)
+++ trunk/test/run-test.rb	2007-09-16 22:50:27 +09:00 (rev 125)
@@ -7,7 +7,7 @@
 top_dir = File.join(File.dirname(__FILE__), "..")
 # $LOAD_PATH.unshift(File.join(top_dir, "..", "ldap", "lib"))
 # $LOAD_PATH.unshift(File.join(top_dir, "..", "ldap"))
-# $LOAD_PATH.unshift(File.join(top_dir, "..", "activeldap", "lib"))
+$LOAD_PATH.unshift(File.join(top_dir, "..", "activeldap", "lib"))
 $LOAD_PATH.unshift(File.join(top_dir, "lib"))
 $LOAD_PATH.unshift(File.join(top_dir, "test"))
 

  Modified: trunk/lib/active_samba_ldap/configuration.rb (+2 -2)
===================================================================
--- trunk/lib/active_samba_ldap/configuration.rb	2007-09-16 22:29:35 +09:00 (rev 124)
+++ trunk/lib/active_samba_ldap/configuration.rb	2007-09-16 22:50:27 +09:00 (rev 125)
@@ -57,10 +57,10 @@
         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)

  Modified: trunk/bin/asl-passwd (+1 -7)
===================================================================
--- trunk/bin/asl-passwd	2007-09-16 22:29:35 +09:00 (rev 124)
+++ trunk/bin/asl-passwd	2007-09-16 22:50:27 +09:00 (rev 125)
@@ -57,14 +57,8 @@
 unless Process.uid.zero?
   prompt = _("Enter your current password: ")
   old_password = ActiveSambaLdap::Command.read_password(prompt)
-
-  auth_class = Class.new(ActiveSambaLdap::Base)
-  config = ActiveSambaLdap::Base.configurations["reference"].symbolize_keys
   begin
-    auth_class.establish_connection(config.merge(:bind_dn => user.dn,
-                                                 :password => old_password,
-                                                 :allow_anonymous => false))
-    auth_class.remove_connection
+    user.bind(old_password)
   rescue ActiveLdap::AuthenticationError
     $stderr.puts(_("password doesn't match."))
     exit 1