[asl-commit] ActiveSambaLdap (trunk) r97:

[null at cozmixng.org]

retro	2007-08-04 11:52:57 +0900 (Sat, 04 Aug 2007)

  New Revision: 97

  Added files:
    trunk/test/test_entry.rb
  Modified files:
    trunk/lib/active_samba_ldap/account_entry.rb

  Log:


  Added: trunk/test/test_entry.rb (+16 -0)
===================================================================
--- trunk/test/test_entry.rb	2007-06-12 20:11:18 +09:00 (rev 96)
+++ trunk/test/test_entry.rb	2007-08-04 11:52:57 +09:00 (rev 97)
@@ -0,0 +1,16 @@
+require 'asl-test-utils'
+
+class EntryTest < Test::Unit::TestCase
+  include AslTestUtils
+
+  priority :must
+  def test_entry_create
+    name = "temporary-user"
+    user = @user_class.create(:uid => name)
+    assert(@user_class.exists?(name))
+    assert_equal(ActiveSambaLdap::Group::DOMAIN_USERS_RID.to_s,
+                 user.primary_group.gid_number)
+  ensure
+    user.destroy if user
+  end
+end

  Modified: trunk/lib/active_samba_ldap/account_entry.rb (+4 -3)
===================================================================
--- trunk/lib/active_samba_ldap/account_entry.rb	2007-06-12 20:11:18 +09:00 (rev 96)
+++ trunk/lib/active_samba_ldap/account_entry.rb	2007-08-04 11:52:57 +09:00 (rev 97)
@@ -92,8 +92,8 @@
       uid_number = options[:uid_number]
       self.change_uid_number(uid_number) if uid_number
 
-      group = options[:group] || retrieve_default_group(options)
-      self.primary_group = group if group
+      primary_group = options[:group] || retrieve_default_primary_group(options)
+      self.primary_group = primary_group if primary_group
 
       self
     end
@@ -177,11 +177,12 @@
       uid
     end
 
-    def retrieve_default_group(options={})
+    def retrieve_default_primary_group(options={})
       group = nil
 
       gid_number = options[:gid_number]
       group_class = options[:group_class]
+      group_class ||= self.class.associated_class(:primary_group)
       unless gid_number
         if options[:create_group]
           group_name = created_group_name