From: Kurt Zeilenga Date: Wed, 16 Mar 2011 19:24:41 +0000 (+0000) Subject: use IANA assigned OID for dontUseCopy control, don't hide anymore X-Git-Tag: OPENLDAP_REL_ENG_2_4_41~204 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=780b32673d340ee63bdc74ef8d522d08796e68ac;p=openldap use IANA assigned OID for dontUseCopy control, don't hide anymore --- diff --git a/include/ldap.h b/include/ldap.h index 79c7431b20..5e7e37a11f 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -296,6 +296,8 @@ typedef struct ldapcontrol { #define LDAP_SYNC_DELETE 3 #define LDAP_SYNC_NEW_COOKIE 4 +/* LDAP Don't Use Copy Control (RFC 6171) */ +#define LDAP_CONTROL_DONTUSECOPY "1.3.6.1.1.22" /* Password policy Controls *//* work in progress */ /* ITS#3458: released; disabled by default */ @@ -309,7 +311,6 @@ typedef struct ldapcontrol { #define LDAP_CONTROL_MANAGEDIT LDAP_CONTROL_RELAX #define LDAP_CONTROL_SLURP "1.3.6.1.4.1.4203.666.5.13" #define LDAP_CONTROL_VALSORT "1.3.6.1.4.1.4203.666.5.14" -#define LDAP_CONTROL_DONTUSECOPY "1.3.6.1.4.1.4203.666.5.15" #define LDAP_CONTROL_X_DEREF "1.3.6.1.4.1.4203.666.5.16" #define LDAP_CONTROL_X_WHATFAILED "1.3.6.1.4.1.4203.666.5.17" diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c index f25ee0795b..71f6abbb10 100644 --- a/servers/slapd/controls.c +++ b/servers/slapd/controls.c @@ -160,7 +160,7 @@ static struct slap_control control_defs[] = { parseDomainScope, LDAP_SLIST_ENTRY_INITIALIZER(next) }, { LDAP_CONTROL_DONTUSECOPY, (int)offsetof(struct slap_control_ids, sc_dontUseCopy), - SLAP_CTRL_GLOBAL|SLAP_CTRL_INTROGATE|SLAP_CTRL_HIDE, + SLAP_CTRL_GLOBAL|SLAP_CTRL_INTROGATE, NULL, NULL, parseDontUseCopy, LDAP_SLIST_ENTRY_INITIALIZER(next) }, { LDAP_CONTROL_X_PERMISSIVE_MODIFY,