Merging an ugly set of changes I had forgotten about.

This commit is contained in:
Austin Ziegler 2011-03-17 21:37:17 -04:00
commit 84e42ceb78
23 changed files with 228 additions and 272 deletions

View file

@ -1,12 +1,16 @@
require 'ostruct'
module Net
module Net # :nodoc:
class LDAP
begin
require 'openssl'
##
# Set to +true+ if OpenSSL is available and LDAPS is supported.
HasOpenSSL = true
rescue LoadError
# :stopdoc:
HasOpenSSL = false
# :startdoc:
end
end
end
@ -19,16 +23,6 @@ require 'net/ldap/dataset'
require 'net/ldap/password'
require 'net/ldap/entry'
# == Net::LDAP
#
# This library provides a pure-Ruby implementation of the LDAP client
# protocol, per RFC-2251. It can be used to access any server which
# implements the LDAP protocol.
#
# Net::LDAP is intended to provide full LDAP functionality while hiding the
# more arcane aspects the LDAP protocol itself, and thus presenting as
# Ruby-like a programming interface as possible.
#
# == Quick-start for the Impatient
# === Quick Example of a user-authentication against an LDAP directory:
#
@ -246,7 +240,7 @@ require 'net/ldap/entry'
# and then keeps it open while it executes a user-supplied block.
# Net::LDAP#open closes the connection on completion of the block.
class Net::LDAP
VERSION = "0.1.1"
VERSION = "0.2"
class LdapError < StandardError; end