From 2ee2a551b1e695b26e2022bbf3d42c989d88e84c Mon Sep 17 00:00:00 2001
From: blackhedd <blackhedd@005445c4-6811-0410-8301-cae4f0071d1d>
Date: Wed, 29 Nov 2006 13:42:21 +0000
Subject: [PATCH] Added syntax support for SearchFilter ANDs and ORs.

---
 ChangeLog       | 2 ++
 lib/net/ldap.rb | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 08f78e1..e8dcf6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
 * Removed an erroneous LdapError value, noticed by Kouhei Sutou.
 * Supported attributes containing blanks (cn=Babs Jensen) to
   Filter#construct. Suggested by an anonymous Rubyforge user.
+* Supported several constructs from the server side of the LDAP protocol.
+* Added a "consuming" String#read_ber! method.
 
 
 == Net::LDAP 0.0.4: August 15, 2006
diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
index dc24b83..a475562 100644
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@@ -306,7 +306,9 @@ module Net
           7 => :string,             # serverSaslCreds
         },
         :constructed => {
-          0 => :array,              # RFC-2251 Control
+          0 => :array,              # RFC-2251 Control and Filter-AND
+          1 => :array,              # SearchFilter-OR
+          2 => :array,              # SearchFilter-NOT
           3 => :array,              # Seach referral
           7 => :array,              # serverSaslCreds
         }