[asl-commit] ActiveSambaLdap (trunk) r126:

[null at cozmixng.org]

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

  New Revision: 126

  Modified files:
    trunk/bin/asl-samba-usermod
    trunk/bin/asl-usermod
    trunk/po/ja/active-samba-ldap.po
    trunk/test/test_asl_usermod.rb

  Log:


  Modified: trunk/bin/asl-samba-usermod (+2 -8)
===================================================================
--- trunk/bin/asl-samba-usermod	2007-09-16 22:40:33 +09:00 (rev 125)
+++ trunk/bin/asl-samba-usermod	2007-09-16 22:50:30 +09:00 (rev 126)
@@ -64,17 +64,11 @@
 unless Process.uid.zero?
   password = ActiveSambaLdap::Command.read_password(_("Enter your password: "))
 
-  auth_class = Class.new(ActiveSambaLdap::Base)
-  config = ActiveSambaLdap::Base.configurations["reference"]
   begin
-    auth_class.establish_connection(config.merge(:bind_dn => member.dn,
-                                                 :password => password,
-                                                 :allow_anonymous => false))
+    member.bind(password)
   rescue ActiveLdap::AuthenticationError
-    $stderr.puts(_("password isn't match."))
+    $stderr.puts(_("password doesn't match."))
     exit 1
-  ensure
-    auth_class.remove_connection
   end
 end
 

  Modified: trunk/po/ja/active-samba-ldap.po (+9 -13)
===================================================================
--- trunk/po/ja/active-samba-ldap.po	2007-09-16 22:40:33 +09:00 (rev 125)
+++ trunk/po/ja/active-samba-ldap.po	2007-09-16 22:50:30 +09:00 (rev 126)
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.4\n"
-"POT-Creation-Date: 2007-09-16 22:22+0900\n"
-"PO-Revision-Date: 2007-09-16 22:21+0900\n"
+"Project-Id-Version: Ruby/ActiveSambaLdap 0.0.5\n"
+"POT-Creation-Date: 2007-09-16 22:47+0900\n"
+"PO-Revision-Date: 2007-09-16 22:47+0900\n"
 "Last-Translator: Kouhei Sutou <kou at cozmixng.org>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -202,19 +202,19 @@
 msgid "Enter your current password: "
 msgstr "現在のパスワードを入力してください: "
 
-#: bin/asl-passwd:69
+#: bin/asl-passwd:63 bin/asl-samba-usermod:70 bin/asl-usermod:181
 msgid "password doesn't match."
 msgstr "パスワードが合っていません。"
 
-#: bin/asl-passwd:74
+#: bin/asl-passwd:68
 msgid "New password: "
 msgstr "新しいパスワード: "
 
-#: bin/asl-passwd:75
+#: bin/asl-passwd:69
 msgid "Retype new password: "
 msgstr "新しいパスワードをもう一度入力してください: "
 
-#: bin/asl-passwd:78
+#: bin/asl-passwd:72
 msgid "New passwords don't match."
 msgstr "新しいパスワードが合っていません。"
 
@@ -334,7 +334,7 @@
 msgid "illegal %s name: %s"
 msgstr "不正な%s名: %s"
 
-#: bin/asl-useradd:182 bin/asl-usermod:314
+#: bin/asl-useradd:182 bin/asl-usermod:308
 msgid "%s already exists: %s"
 msgstr "すでに存在する%sです: %s"
 
@@ -354,10 +354,6 @@
 msgid "Enter your password: "
 msgstr "あなたのパスワードを入力してください: "
 
-#: bin/asl-samba-usermod:74 bin/asl-usermod:185
-msgid "password isn't match."
-msgstr "パスワードが合っていません。"
-
 #: bin/asl-populate:30
 msgid "first uid number to allocate"
 msgstr "最初に割り当てるUID番号"
@@ -456,7 +452,7 @@
 msgid "enable this user"
 msgstr "このユーザを有効にする"
 
-#: bin/asl-usermod:240 bin/asl-usermod:244
+#: bin/asl-usermod:234 bin/asl-usermod:238
 msgid "not implemented."
 msgstr "実装されていません。"
 

  Modified: trunk/test/test_asl_usermod.rb (+8 -0)
===================================================================
--- trunk/test/test_asl_usermod.rb	2007-09-16 22:40:33 +09:00 (rev 125)
+++ trunk/test/test_asl_usermod.rb	2007-09-16 22:50:30 +09:00 (rev 126)
@@ -520,6 +520,14 @@
     end
   end
 
+  def test_wrong_password
+    make_dummy_user do |user, password|
+      assert_asl_usermod_failed(user.uid,
+                                "wrong-#{password}",
+                                _("password doesn't match."))
+    end
+  end
+
   private
   def assert_asl_usermod_successfully(name, password, *args)
     args << name

  Modified: trunk/bin/asl-usermod (+2 -8)
===================================================================
--- trunk/bin/asl-usermod	2007-09-16 22:40:33 +09:00 (rev 125)
+++ trunk/bin/asl-usermod	2007-09-16 22:50:30 +09:00 (rev 126)
@@ -175,17 +175,11 @@
 unless Process.uid.zero?
   password = ActiveSambaLdap::Command.read_password(_("Enter your password: "))
 
-  auth_class = Class.new(ActiveSambaLdap::Base)
-  config = ActiveSambaLdap::Base.configurations["reference"]
   begin
-    auth_class.establish_connection(config.merge(:bind_dn => member.dn,
-                                                 :password => password,
-                                                 :allow_anonymous => false))
+    member.bind(password)
   rescue ActiveLdap::AuthenticationError
-    $stderr.puts(_("password isn't match."))
+    $stderr.puts(_("password doesn't match."))
     exit 1
-  ensure
-    auth_class.remove_connection
   end
 end