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

Fix merge artifacts because I'm a dummy dumb head

Browse source
This commit is contained in:
Rory O'Connell 2010-09-25 15:27:59 -05:00
parent a3dcb965db
commit 7143490850
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Rakefile
View file

@ -1,5 +1,5 @@
require "rubygems" require "rubygems"
require 'hanna/rdoctask' # require 'hanna/rdoctask'
require 'hoe' require 'hoe'
$LOAD_PATH.unshift('lib') $LOAD_PATH.unshift('lib')

4
lib/net/ldap.rb
View file

@ -1519,11 +1519,7 @@ class Net::LDAP::Connection #:nodoc:
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
<<<<<<< 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" ) (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 pdu.result_code
end end