Keep a reference to admin_user & admin_password for Global Catalog

Dave Sims · Dave Sims · commit b75644ef60de · 2016-07-25T11:35:37.000-05:00
diff --git a/lib/github/ldap.rb b/lib/github/ldap.rb
@@ -68,6 +68,9 @@ class Ldap
     #
     def initialize(options = {})
       @uid = options[:uid] || "sAMAccountName"
+      @instrumentation_service = options[:instrumentation_service]
+      @admin_user = options[:admin_user]
+      @admin_password = options[:admin_password]
 
       @connection = Net::LDAP.new({
         host: options[:host],
@@ -215,7 +218,7 @@ def global_catalog_connection
       if active_directory_capability?
         @global_catalog_connection ||= Net::LDAP.new({
           host: @connection.host,
-          auth: @connection.instance_variable_get(:@auth),
+          auth: {username: admin_user, password: admin_password},
           instrumentation_service: @connection.instance_variable_get(:@instrumentation_service),
           port: 3268,
         })
@@ -344,5 +347,9 @@ def configure_member_search_strategy(strategy = nil)
     def active_directory_capability?
       capabilities[:supportedcapabilities].include?(ACTIVE_DIRECTORY_V51_OID)
     end
+
+    private
+
+    attr_reader :admin_user, :admin_password
   end
 end
