Merge branch 'master' of github.com:RoryO/ruby-net-ldap

This commit is contained in:
Rory O'Connell 2010-09-25 15:05:06 -05:00
commit a3dcb965db
2 changed files with 4 additions and 2 deletions

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
spec/ldap.yml
.rvmrc
*.gemspec
pkg/
*.swp

View file

@ -532,7 +532,7 @@ class Net::LDAP
else
os.code = 0
end
os.message = LDAP.result2string(os.code)
os.message = Net::LDAP.result2string(os.code)
os
end
@ -1170,7 +1170,7 @@ class Net::LDAP::Connection #:nodoc:
# go here.
when :start_tls
msgid = next_msgid.to_ber
request = [StartTlsOid.to_ber].to_ber_appsequence(Net::LDAP::PDU::ExtendedRequest)
request = [Net::LDAP::StartTlsOid.to_ber].to_ber_appsequence(Net::LDAP::PDU::ExtendedRequest)
request_pkt = [msgid, request].to_ber_sequence
@conn.write request_pkt
be = @conn.read_ber(Net::LDAP::AsnSyntax)