add noop back in

diff --git a/CHANGES b/CHANGES
index 88d056112333e7703581a3a3e9c8a4896d1b31e2..879c064473aaf3a141cfdfa4e27ddffc75a3d1b2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,9 +9,9 @@ OpenLDAP 2.1.5 Engineering
        Fixed liblber write bugs (ITS#1983)
        Added slapadd lastmod attribute support
        Added ldap tools passfile (-y) support (ITS#2031)
-       Updated slapd hasSubordinates support
-       Updated slapd extensible matching support
-       Updated noop & matchedval control support
+       Updated slapd hasSubordinates
+       Updated slapd extensible matching
+       Updated matched values and noop controls
        Updated back-passwd gecos buffer size bug (ITS#2046)
        Updated back-sql
        Build Environment

diff --git a/include/ldap.h b/include/ldap.h
index 239a402403c702ef396618194e736b9a2ce2ef15..9bb9986f58a9bce6e12227b7eb62647f7f8302f7 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -182,6 +182,7 @@ typedef struct ldapcontrol {
 /* LDAP Controls */
 
 #define LDAP_CONTROL_MANAGEDSAIT       "2.16.840.1.113730.3.4.2"
+#define LDAP_CONTROL_NOOP                      "1.3.6.1.4.1.4203.1.10.2"
 
 #define LDAP_CONTROL_SORTREQUEST    "1.2.840.113556.1.4.473"
 #define LDAP_CONTROL_SORTRESPONSE      "1.2.840.113556.1.4.474"