deac/ruby-net-ldap
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bring back the Net::LDAP namespace

Browse source
This commit is contained in:
Michael Baker 2011-11-17 23:32:03 +00:00
parent 528ef30801
commit 63db8c836a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/net/ldap.rb
View file

@ -553,7 +553,7 @@ class Net::LDAP
# anything with the bind results. We then pass self to the caller's # anything with the bind results. We then pass self to the caller's
# block, where he will execute his LDAP operations. Of course they will # block, where he will execute his LDAP operations. Of course they will
# all generate auth failures if the bind was unsuccessful. # all generate auth failures if the bind was unsuccessful.
raise LdapError, "Open already in progress" if @open_connection raise Net::LDAP::LdapError, "Open already in progress" if @open_connection
begin begin
@open_connection = Net::LDAP::Connection.new(:host => @host, @open_connection = Net::LDAP::Connection.new(:host => @host,
@ -1034,7 +1034,7 @@ class Net::LDAP
# dn = "mail=deleteme@example.com, ou=people, dc=example, dc=com" # dn = "mail=deleteme@example.com, ou=people, dc=example, dc=com"
# ldap.delete_tree :dn => dn # ldap.delete_tree :dn => dn
def delete_tree(args) def delete_tree(args)
delete(args.merge(:control_codes => [[LDAPControls::DELETE_TREE, true]])) delete(args.merge(:control_codes => [[Net::LDAP::LDAPControls::DELETE_TREE, true]]))
end end
# This method is experimental and subject to change. Return the rootDSE # This method is experimental and subject to change. Return the rootDSE
# record from the LDAP server as a Net::LDAP::Entry, or an empty Entry if # record from the LDAP server as a Net::LDAP::Entry, or an empty Entry if
@ -1106,7 +1106,7 @@ class Net::LDAP
#++ #++
def paged_searches_supported? def paged_searches_supported?
@server_caps ||= search_root_dse @server_caps ||= search_root_dse
@server_caps[:supportedcontrol].include?(LDAPControls::PAGED_RESULTS) @server_caps[:supportedcontrol].include?(Net::LDAP::LDAPControls::PAGED_RESULTS)
end end
end # class LDAP end # class LDAP
@ -1403,7 +1403,7 @@ class Net::LDAP::Connection #:nodoc:
controls = [] controls = []
controls << controls <<
[ [
LDAPControls::PAGED_RESULTS.to_ber, Net::LDAP::LDAPControls::PAGED_RESULTS.to_ber,
# Criticality MUST be false to interoperate with normal LDAPs. # Criticality MUST be false to interoperate with normal LDAPs.
false.to_ber, false.to_ber,
rfc2696_cookie.map{ |v| v.to_ber}.to_ber_sequence.to_s.to_ber rfc2696_cookie.map{ |v| v.to_ber}.to_ber_sequence.to_s.to_ber
@ -1451,7 +1451,7 @@ class Net::LDAP::Connection #:nodoc:
more_pages = false more_pages = false
if result_code == 0 and controls if result_code == 0 and controls
controls.each do |c| controls.each do |c|
if c.oid == LDAPControls::PAGED_RESULTS if c.oid == Net::LDAP::LDAPControls::PAGED_RESULTS
# just in case some bogus server sends us more than 1 of these. # just in case some bogus server sends us more than 1 of these.
more_pages = false more_pages = false
if c.value and c.value.length > 0 if c.value and c.value.length > 0