deac/ruby-net-ldap
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed bug noticed by Matthias Tarasiewicz: from_single_ldif_string

Browse source 
was returning DN attributes with a prepended nil element.
This commit is contained in:
blackhedd 2006-09-30 14:59:13 +00:00
parent 14c3db9b83
commit 82e2cc3592
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/net/ldap/entry.rb
View file

@ -184,9 +184,20 @@ class LDAP
# Eventually, we should have a class method that parses large LDIF # Eventually, we should have a class method that parses large LDIF
# streams into individual LDIF blocks (delimited by blank lines) # streams into individual LDIF blocks (delimited by blank lines)
# and passes them here. # and passes them here.
#
# There is one oddity, noticed by Matthias Tarasiewicz: as originally
# written, this code would return an Entry object in which the DN
# attribute consisted of a two-element array, and the first element was
# nil. That's because Entry#initialize doesn't like to create an object
# without a DN attribute so it adds one: nil. The workaround here is
# to wipe out the nil DN after creating the Entry object, and trust the
# LDIF string to fill it in. If it doesn't we return a nil at the end.
# (30Sep06, FCianfrocca)
#
class << self class << self
def from_single_ldif_string ldif def from_single_ldif_string ldif
entry = Entry.new entry = Entry.new
entry[:dn] = []
ldif.split(/\r?\n/m).each {|line| ldif.split(/\r?\n/m).each {|line|
break if line.length == 0 break if line.length == 0
if line =~ /\A([\w]+):(:?)[\s]*/ if line =~ /\A([\w]+):(:?)[\s]*/