From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 30 Aug 2002 06:32:06 +0000 (+0000)
Subject: add noop back in
X-Git-Tag: OPENLDAP_REL_ENG_2_1_5~77
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d384dd7d4f0bc3b9a93df7a21f15c57d0880d6e2;p=openldap

add noop back in
---

diff --git a/CHANGES b/CHANGES
index 88d0561123..879c064473 100644
--- 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 239a402403..9bb9986f58 100644
--- 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"