Skip to content

Commit 262819a

Browse files
author
Jerry Cheung
committed
ber formatted next_msgid
1 parent d318ff4 commit 262819a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/net/ldap/connection.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ def write(packet)
141141
end
142142
private :write
143143

144-
# Internal: Convert `request` and `controls` to a BER data packet with the
145-
# next message id and call `#write` on it.
144+
# Internal: Convert BER formatted `request` and `controls` to a BER data
145+
# packet with the next message id (`#next_msgid`) and call `#write` on it.
146146
def write_request(request, controls = nil)
147-
write([next_msgid, request, controls].compact.to_ber_sequence)
147+
write([next_msgid.to_ber, request, controls].compact.to_ber_sequence)
148148
end
149149

150150
def next_msgid

test/test_ldap_connection.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ def test_modify_ops_replace
2424

2525
def test_write_request
2626
mock = Minitest::Mock.new
27-
mock.expect(:write, true, [[1, "request"].to_ber_sequence])
27+
mock.expect(:write, true, [[1.to_ber, "request"].to_ber_sequence])
2828
conn = Net::LDAP::Connection.new(:socket => mock)
2929
conn.write_request("request")
3030
end
3131

3232
def test_write_request_with_controls
3333
mock = Minitest::Mock.new
34-
mock.expect(:write, true, [[1, "request", "controls"].to_ber_sequence])
34+
mock.expect(:write, true, [[1.to_ber, "request", "controls"].to_ber_sequence])
3535
conn = Net::LDAP::Connection.new(:socket => mock)
3636
conn.write_request("request", "controls")
3737
end
3838

3939
def test_write_request_increments_msgid
4040
mock = Minitest::Mock.new
41-
mock.expect(:write, true, [[1, "request1"].to_ber_sequence])
42-
mock.expect(:write, true, [[2, "request2"].to_ber_sequence])
41+
mock.expect(:write, true, [[1.to_ber, "request1"].to_ber_sequence])
42+
mock.expect(:write, true, [[2.to_ber, "request2"].to_ber_sequence])
4343
conn = Net::LDAP::Connection.new(:socket => mock)
4444
conn.write_request("request1")
4545
conn.write_request("request2")

0 commit comments

Comments
 (0)