activeldap/activeldap@3459b48 [master] Merge pull request #153 from hide24/master

1 view
Skip to first unread message

Kouhei Sutou

unread,
Mar 8, 2018, 3:33:13 AM3/8/18
to activeld...@googlegroups.com
Author
Kouhei Sutou <k...@cozmixng.org>
Date
2018-03-08 17:33:04 +0900 (Thu, 08 Mar 2018)
New Revision
3459b489117018479b4226f2251b1567f638b0c4
Message
Merge pull request #153 from hide24/master

Populate.ensure_base was added :dc_base_class and :ou_base_class options.

Patch by hide_24. Thanks!!!

hide24

unread,
Mar 8, 2018, 3:33:14 AM3/8/18
to activeld...@googlegroups.com
Author
hide24 <hidetoshi...@gmail.com>
Date
2018-03-08 17:14:40 +0900 (Thu, 08 Mar 2018)
New Revision
d951a28f92eddfb5c58b1bda50e74f705eaea6ea
Merge
  • Merged 3459b48: Merge pull request #153 from hide24/master
Message
Populate.ensure_base was added :dc_base_class and :ou_base_class options.
Modified files
  Modified: lib/active_ldap/populate.rb (+5 -3)
===================================================================

...
1
2
3
4
 
5
6
 
 
7
8
9
...
15
16
17
18
 
19
20
21
22
 
23
24
25

...
1
2
3
 
4
5
6
7
8
9
10
11
...
17
18
19
 
20
21
22
23
 
24
25
26
27

@@ -1,9 +1,11 @@
 module ActiveLdap
   module Populate
     module_function
-    def ensure_base(base_class=nil)
+    def ensure_base(base_class=nil, options={})
       base_class ||= Base
       return unless base_class.search(:scope => :base).empty?
+      dc_base_class = options[:dc_base_class] || base_class
+      ou_base_class = options[:ou_base_class] || base_class
 
       base_dn = DN.parse(base_class.base)
       suffixes = []
@@ -15,11 +17,11 @@ module ActiveLdap
         begin
           case name.downcase
           when "dc"
-            ensure_dc(value, prefix, base_class)
+            ensure_dc(value, prefix, dc_base_class)
           when "ou"
             ensure_ou(value,
                       :base => prefix,
-                      :base_class => base_class)
+                      :base_class => ou_base_class)
           end
         rescue ActiveLdap::OperationNotPermitted
         end
Reply all
Reply to author
Forward
0 new messages