Skip to content

Commit b225088

Browse files
committed
Replace hardcoded application specific tags with constants
1 parent 91cac8a commit b225088

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

lib/net/ldap/connection.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def bind_simple(auth)
227227
raise Net::LDAP::LdapError, "Invalid binding information" unless (user && psw)
228228

229229
request = [LdapVersion.to_ber, user.to_ber,
230-
psw.to_ber_contextspecific(0)].to_ber_appsequence(0)
230+
psw.to_ber_contextspecific(0)].to_ber_appsequence(Net::LDAP::PDU::BindRequest)
231231
write(request)
232232

233233
pdu = read
@@ -265,7 +265,7 @@ def bind_sasl(auth)
265265
n = 0
266266
loop {
267267
sasl = [mech.to_ber, cred.to_ber].to_ber_contextspecific(3)
268-
request = [LdapVersion.to_ber, "".to_ber, sasl].to_ber_appsequence(0)
268+
request = [LdapVersion.to_ber, "".to_ber, sasl].to_ber_appsequence(Net::LDAP::PDU::BindRequest)
269269
write(request)
270270

271271
pdu = read
@@ -450,7 +450,7 @@ def search(args = nil)
450450
attrs_only.to_ber,
451451
filter.to_ber,
452452
ber_attrs.to_ber_sequence
453-
].to_ber_appsequence(3)
453+
].to_ber_appsequence(Net::LDAP::PDU::SearchRequest)
454454

455455
# rfc2696_cookie sometimes contains binary data from Microsoft Active Directory
456456
# this breaks when calling to_ber. (Can't force binary data to UTF-8)
@@ -584,7 +584,7 @@ def modify(args)
584584
modify_dn = args[:dn] or raise "Unable to modify empty DN"
585585
ops = self.class.modify_ops args[:operations]
586586
request = [ modify_dn.to_ber,
587-
ops.to_ber_sequence ].to_ber_appsequence(6)
587+
ops.to_ber_sequence ].to_ber_appsequence(Net::LDAP::PDU::ModifyRequest)
588588
write(request)
589589

590590
pdu = read
@@ -610,7 +610,7 @@ def add(args)
610610
add_attrs << [ k.to_s.to_ber, Array(v).map { |m| m.to_ber}.to_ber_set ].to_ber_sequence
611611
}
612612

613-
request = [add_dn.to_ber, add_attrs.to_ber_sequence].to_ber_appsequence(8)
613+
request = [add_dn.to_ber, add_attrs.to_ber_sequence].to_ber_appsequence(Net::LDAP::PDU::AddRequest)
614614
write(request)
615615

616616
pdu = read
@@ -634,7 +634,7 @@ def rename(args)
634634
request = [old_dn.to_ber, new_rdn.to_ber, delete_attrs.to_ber]
635635
request << new_superior.to_ber_contextspecific(0) unless new_superior == nil
636636

637-
write(request.to_ber_appsequence(12))
637+
write(request.to_ber_appsequence(Net::LDAP::PDU::ModifyRDNRequest))
638638

639639
pdu = read
640640

@@ -651,7 +651,7 @@ def rename(args)
651651
def delete(args)
652652
dn = args[:dn] or raise "Unable to delete empty DN"
653653
controls = args.include?(:control_codes) ? args[:control_codes].to_ber_control : nil #use nil so we can compact later
654-
request = dn.to_s.to_ber_application_string(10)
654+
request = dn.to_s.to_ber_application_string(Net::LDAP::PDU::DeleteRequest)
655655
write(request, controls)
656656

657657
pdu = read

0 commit comments

Comments
 (0)