Merge branch 'master' of github.com:RoryO/ruby-net-ldap
This commit is contained in:
commit
a3dcb965db
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
spec/ldap.yml
|
||||||
|
.rvmrc
|
||||||
*.gemspec
|
*.gemspec
|
||||||
pkg/
|
pkg/
|
||||||
*.swp
|
*.swp
|
||||||
|
|
|
@ -532,7 +532,7 @@ class Net::LDAP
|
||||||
else
|
else
|
||||||
os.code = 0
|
os.code = 0
|
||||||
end
|
end
|
||||||
os.message = LDAP.result2string(os.code)
|
os.message = Net::LDAP.result2string(os.code)
|
||||||
os
|
os
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1170,7 +1170,7 @@ class Net::LDAP::Connection #:nodoc:
|
||||||
# go here.
|
# go here.
|
||||||
when :start_tls
|
when :start_tls
|
||||||
msgid = next_msgid.to_ber
|
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
|
request_pkt = [msgid, request].to_ber_sequence
|
||||||
@conn.write request_pkt
|
@conn.write request_pkt
|
||||||
be = @conn.read_ber(Net::LDAP::AsnSyntax)
|
be = @conn.read_ber(Net::LDAP::AsnSyntax)
|
||||||
|
|
Loading…
Reference in a new issue