Import fixes from kschiess

lib/net/ldap/dataset.rb

@@ -29,80 +29,78 @@
 
 
 module Net
-class LDAP
-
-class Dataset < Hash
-
-  attr_reader :comments
-
-
-  def Dataset::read_ldif io
-    ds = Dataset.new
-
-    line = io.gets && chomp
-    dn = nil
-
-    while line
-      io.gets and chomp
-      if $_ =~ /^[\s]+/
-        line << " " << $'
-      else
-        nextline = $_
-
-        if line =~ /^\#/
-          ds.comments << line
-        elsif line =~ /^dn:[\s]*/i
-          dn = $'
-          ds[dn] = Hash.new {|k,v| k[v] = []}
-        elsif line.length == 0
-          dn = nil
-        elsif line =~ /^([^:]+):([\:]?)[\s]*/
-          # $1 is the attribute name
-          # $2 is a colon iff the attr-value is base-64 encoded
-          # $' is the attr-value
-          # Avoid the Base64 class because not all Ruby versions have it.
-          attrvalue = ($2 == ":") ? $'.unpack('m').shift : $'
-          ds[dn][$1.downcase.intern] << attrvalue
+  class LDAP
+    class Dataset < Hash
+      attr_reader :comments
+      class IOFilter
+        def initialize(io)
+          @io = io
+        end
+        
+        def gets
+          s = @io.gets
+          s.chomp if s
         end
-
-        line = nextline
       end
-    end
+      
+      def self.read_ldif io
+        ds = Dataset.new
+
+        line = io.gets
+        dn = nil
+
+        while line
+          io.gets and chomp
+          if new_line =~ /^[\s]+/
+            line << " " << $'
+          else
+            nextline = new_line
+
+            if line =~ /^\#/
+              ds.comments << line
+            elsif line =~ /^dn:[\s]*/i
+              dn = $'
+              ds[dn] = Hash.new {|k,v| k[v] = []}
+            elsif line.length == 0
+              dn = nil
+            elsif line =~ /^([^:]+):([\:]?)[\s]*/
+              # $1 is the attribute name
+              # $2 is a colon iff the attr-value is base-64 encoded
+              # $' is the attr-value
+              # Avoid the Base64 class because not all Ruby versions have it.
+              attrvalue = ($2 == ":") ? $'.unpack('m').shift : $'
+              ds[dn][$1.downcase.intern] << attrvalue
+            end
+
+            line = nextline
+          end
+        end
   
-    ds
-  end
+        ds
+      end
 
 
-  def initialize
-    @comments = []
-  end
+      def initialize
+        @comments = []
+      end
 
 
-  def to_ldif
-    ary = []
-    ary += (@comments || [])
+      def to_ldif
+        ary = []
+        ary += (@comments || [])
+        keys.sort.each do |dn|
+          ary << "dn: #{dn}"
 
-    keys.sort.each {|dn|
-      ary << "dn: #{dn}"
-
-      self[dn].keys.map {|sym| sym.to_s}.sort.each {|attr|
-        self[dn][attr.intern].each {|val|
-          ary << "#{attr}: #{val}"
-        }
-      }
-
-      ary << ""
-    }
-
-    block_given? and ary.each {|line| yield line}
-
-    ary
-  end
-
-
-end # Dataset
-
-end # LDAP
-end # Net
+          self[dn].keys.map {|sym| sym.to_s}.sort.each do |attr|
+            self[dn][attr.intern].each {|val| ary << "#{attr}: #{val}" }
+          end
 
+          ary << ""
+        end
+        block_given? and ary.each {|line| yield line}
+        ary
+      end
 
+    end 
+  end 
+end

lib/net/ldap/psw.rb

@@ -27,36 +27,36 @@
 
 
 module Net
-class LDAP
+  class LDAP
+    class Password
+      class << self
 
-
-class Password
-  class << self
-
-  # Generate a password-hash suitable for inclusion in an LDAP attribute.
-  # Pass a hash type (currently supported: :md5 and :sha) and a plaintext
-  # password. This function will return a hashed representation.
-  # STUB: This is here to fulfill the requirements of an RFC, which one?
-  # TODO, gotta do salted-sha and (maybe) salted-md5.
-  # Should we provide sha1 as a synonym for sha1? I vote no because then
-  # should you also provide ssha1 for symmetry?
-  def generate( type, str )
-    case type
-    when :md5
-      "{MD5}#{ [MD5.new( str.to_s ).digest].pack("m").chomp }"
-    when :sha
-      "{SHA}#{ [SHA1.new( str.to_s ).digest].pack("m").chomp }"
-    # when ssha
-    else
-      raise Net::LDAP::LdapError.new( "unsupported password-hash type (#{type})" )
+      # Generate a password-hash suitable for inclusion in an LDAP attribute.
+      # Pass a hash type (currently supported: :md5 and :sha) and a plaintext
+      # password. This function will return a hashed representation.
+      # STUB: This is here to fulfill the requirements of an RFC, which one?
+      # TODO, gotta do salted-sha and (maybe) salted-md5.
+      # Should we provide sha1 as a synonym for sha1? I vote no because then
+      # should you also provide ssha1 for symmetry?
+        def generate( type, str )
+          digest, digest_name = case type
+          when :md5
+            [Digest::MD5.new, 'MD5']
+          when :sha
+            [Digest::SHA1.new, 'sha']
+        # when ssha
+          else
+            raise Net::LDAP::LdapError.new( "unsupported password-hash type (#{type})" )
+          end
+          
+          digest << str.to_s
+          return "{#{digest_name}}#{[digest.digest].pack('m').chomp }"
+        end
+        
+      
+      end
     end
-  end
-
-  end
+  end 
 end
 
 
-end # class LDAP
-end # module Net
-
-