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

Merge remote branch 'tonyheadford/master'

Browse source 
Conflicts:
	lib/net/ldap.rb
This commit is contained in:
Rory O'Connell 2010-09-25 15:02:34 -05:00
commit 43d50d6498
2 changed files with 83 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/net/ldap.rb
View file

@ -1507,16 +1507,23 @@ class Net::LDAP::Connection #:nodoc:
#--
# TODO: need to support a time limit, in case the server fails to respond.
#++
def rename(args)
def rename args
old_dn = args[:olddn] or raise "Unable to rename empty DN"
new_rdn = args[:newrdn] or raise "Unable to rename to empty RDN"
delete_attrs = args[:delete_attributes] ? true : false
new_superior = args[:new_superior]
request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber].to_ber_appsequence(12)
pkt = [next_msgid.to_ber, request].to_ber_sequence
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
@conn.write pkt
<<<<<<< HEAD
(be = @conn.read_ber(Net::LDAP::AsnSyntax)) && (pdu = Net::LDAP::PDU.new(be)) && (pdu.app_tag == 13) or raise Net::LDAP::LdapError, "response missing or invalid"
=======
(be = @conn.read_ber(AsnSyntax)) && (pdu = LdapPdu.new( be )) && (pdu.app_tag == 13) or raise LdapError.new( "response missing or invalid" )
>>>>>>> tonyheadford/master
pdu.result_code
end