Skip to content

Commit f8649bc

Browse files
author
blackhedd
committed
Changed LDAP#search to return T/F instead of numeric LDAP code,
and adjusted the tests accordingly.
1 parent 030bb9c commit f8649bc

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

lib/net/ldap.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,22 +199,21 @@ def open
199199
#
200200
def search args
201201
if @open_connection
202-
result_code = @open_connection.search( args ) {|values|
202+
@result = @open_connection.search( args ) {|values|
203203
block_given? and yield( values )
204204
}
205-
result_code
206205
else
207-
result_code = 0
206+
@result = 0
208207
conn = Connection.new( :host => @host, :port => @port )
209-
if (result_code = conn.bind( args[:auth] || @auth )) == 0
210-
result_code = conn.search( args ) {|values|
208+
if (@result = conn.bind( args[:auth] || @auth )) == 0
209+
@result = conn.search( args ) {|values|
211210
block_given? and yield( values )
212211
}
213212
end
214213
conn.close
215-
result_code
216214
end
217215

216+
@result == 0
218217
end
219218

220219
#

tests/testldap.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,12 @@ def test_search
8888
ldap = Net::LDAP.new :host => @host, :port => @port, :auth => @auth
8989

9090
search = {:base => "dc=smalldomain,dc=com"}
91-
assert_equal( 32, ldap.search( search ))
91+
assert_equal( false, ldap.search( search ))
92+
assert_equal( 32, ldap.get_operation_result.code )
9293

9394
search = {:base => "dc=bayshorenetworks,dc=com"}
94-
assert_equal( 0, ldap.search( search ))
95+
assert_equal( true, ldap.search( search ))
96+
assert_equal( 0, ldap.get_operation_result.code )
9597

9698
ldap.search( search ) {|res|
9799
assert_equal( res, @ldif )
@@ -118,7 +120,7 @@ def internal_test_search_attributes attrs_to_search
118120
}
119121
}
120122

121-
assert_equal( 0, ldap.search( search ))
123+
assert_equal( true, ldap.search( search ))
122124
ldap.search( search ) {|res|
123125
res_keys = res.keys.sort
124126
ldif_keys = ldif.keys.sort
@@ -164,7 +166,7 @@ def test_open
164166
ldap.open {|ldap|
165167
10.times {
166168
rc = ldap.search( :base => "dc=bayshorenetworks,dc=com" )
167-
assert_equal( 0, rc )
169+
assert_equal( true, rc )
168170
}
169171
}
170172
end
@@ -174,7 +176,7 @@ def test_ldap_open
174176
Net::LDAP.open( :host => @host, :port => @port, :auth => @auth ) {|ldap|
175177
10.times {
176178
rc = ldap.search( :base => "dc=bayshorenetworks,dc=com" )
177-
assert_equal( 0, rc )
179+
assert_equal( true, rc )
178180
}
179181
}
180182
end

0 commit comments

Comments
 (0)