[asl-commit] ActiveSambaLdap r23:

[kou at cozmixng.org]

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

  New Revision: 23

  Modified files:
    trunk/lib/active_samba_ldap/populate.rb

  Log:


  Modified: trunk/lib/active_samba_ldap/populate.rb (+11 -5)
===================================================================
--- trunk/lib/active_samba_ldap/populate.rb	2006-11-14 11:59:39 +09:00 (rev 22)
+++ trunk/lib/active_samba_ldap/populate.rb	2007-08-04 11:32:08 +09:00 (rev 23)
@@ -211,11 +211,17 @@
 
         def make_pool
           config = @base.configuration
-          pool = @options[:unix_id_pool_class].new(config[:samba_domain])
-          pool.samba_sid = config[:sid]
-          pool.uid_number = @options[:start_uid]
-          pool.gid_number = @options[:start_gid]
-          pool.save!
+          klass = @options[:unix_id_pool_class]
+          name = config[:samba_domain]
+          if klass.exists?(name)
+            pool = klass.find(name)
+          else
+            pool = klass.new(name)
+            pool.samba_sid = config[:sid]
+            pool.uid_number = @options[:start_uid]
+            pool.gid_number = @options[:start_gid]
+            pool.save!
+          end
           [pool]
         end
       end