From 868e11f6f5b5544a94de913daa6ce1ececb1d5de Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 16 Mar 2011 19:24:41 +0000 Subject: [PATCH] use IANA assigned OID for dontUseCopy control, don't hide anymore --- include/ldap.h | 3 ++- servers/slapd/controls.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/ldap.h b/include/ldap.h index 0cd3579d60..9d7ae014ca 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -298,6 +298,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 */ @@ -311,7 +313,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 692625c7fb..a7188be37a 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, -- 2.39.5