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

Merge pull request #20 from danabr/rename_fix

Browse source 
Rename fix
This commit is contained in:
Rory O'Connell 2011-09-24 11:32:28 -07:00
parent 5c3cbb7fe6 c90821a7bd
commit 6d7be69653
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/net/ldap.rb
View file

@ -1320,7 +1320,7 @@ class Net::LDAP::Connection #:nodoc:
# in the protocol. # in the protocol.
#++ #++
def search(args = {}) def search(args = {})
search_filter = (args && args[:filter]) || search_filter = (args && args[:filter]) ||
Net::LDAP::Filter.eq("objectclass", "*") Net::LDAP::Filter.eq("objectclass", "*")
search_filter = Net::LDAP::Filter.construct(search_filter) if search_filter.is_a?(String) search_filter = Net::LDAP::Filter.construct(search_filter) if search_filter.is_a?(String)
search_base = (args && args[:base]) || "dc=example, dc=com" search_base = (args && args[:base]) || "dc=example, dc=com"
@ -1521,15 +1521,17 @@ class Net::LDAP::Connection #:nodoc:
old_dn = args[:olddn] or raise "Unable to rename empty DN" old_dn = args[:olddn] or raise "Unable to rename empty DN"
new_rdn = args[:newrdn] or raise "Unable to rename to empty RDN" new_rdn = args[:newrdn] or raise "Unable to rename to empty RDN"
delete_attrs = args[:delete_attributes] ? true : false delete_attrs = args[:delete_attributes] ? true : false
new_superior = args[:new_superior] new_superior = args[:new_superior]
request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber]
request << new_superior.to_ber unless new_superior == nil
request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber]
request << new_superior.to_ber unless new_superior == nil
pkt = [next_msgid.to_ber, request.to_ber_appsequence(12)].to_ber_sequence pkt = [next_msgid.to_ber, request.to_ber_appsequence(12)].to_ber_sequence
@conn.write pkt @conn.write pkt
(be = @conn.read_ber(AsnSyntax)) && (pdu = LdapPdu.new( be )) && (pdu.app_tag == 13) or raise LdapError.new( "response missing or invalid" ) (be = @conn.read_ber(Net::LDAP::AsnSyntax)) &&
(pdu = Net::LDAP::PDU.new( be )) && (pdu.app_tag == 13) or
raise Net::LDAP::LdapError.new( "response missing or invalid" )
pdu.result_code pdu.result_code
end end