From dab426476ffcab92df7fcb2f76064e46b5101d7f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 18 Oct 2010 10:24:56 +1100 Subject: Revert "s4:dsdb - make the RELAX control private" This must be available to the OpenLDAP backend, to set the GUID values in some situations. We need a proper ACL mechanism to control the use or abuse of this control. This reverts commit 10adee89367cee9add993869280542418fb3d370. --- source4/lib/ldb/include/ldb.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index d346b0f2d4..7f4752e252 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -510,12 +510,6 @@ typedef int (*ldb_qsort_cmp_fn_t) (void *v1, void *v2, void *opaque); */ #define LDB_CONTROL_AS_SYSTEM_OID "1.3.6.1.4.1.7165.4.3.7" -/** - LDB_CONTROL_RELAX_OID relaxes some of the AD constraints to allow some - special operations - should be used carefully! -*/ -#define LDB_CONTROL_RELAX_OID "1.3.6.1.4.1.4203.666.5.12" - /* AD controls */ /** @@ -673,6 +667,14 @@ typedef int (*ldb_qsort_cmp_fn_t) (void *v1, void *v2, void *opaque); /* Other standardised controls */ +/** + OID for the allowing client to request temporary relaxed + enforcement of constraints of the x.500 model. + + \sa draft managedit. +*/ +#define LDB_CONTROL_RELAX_OID "1.3.6.1.4.1.4203.666.5.12" + /* OID for LDAP Extended Operation PASSWORD_CHANGE. -- cgit