summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-10-18 10:24:56 +1100
committerAndrew Bartlett <abartlet@samba.org>2010-10-18 00:16:17 +0000
commitdab426476ffcab92df7fcb2f76064e46b5101d7f (patch)
tree5198a35118b97c507dc586a252a373347dd9718e /source4/libcli
parent9f0d1c72be4f763f3323e7627158ea5a68faa02b (diff)
downloadsamba-dab426476ffcab92df7fcb2f76064e46b5101d7f.tar.gz
samba-dab426476ffcab92df7fcb2f76064e46b5101d7f.tar.bz2
samba-dab426476ffcab92df7fcb2f76064e46b5101d7f.zip
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.
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/ldap/ldap_controls.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 37ade5b299..8cc0a61cb3 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -1156,10 +1156,9 @@ static const struct ldap_control_handler ldap_known_controls[] = {
{ LDB_CONTROL_PERMISSIVE_MODIFY_OID, decode_flag_request, encode_flag_request },
{ LDB_CONTROL_SERVER_LAZY_COMMIT, decode_flag_request, encode_flag_request },
{ LDB_CONTROL_RODC_DCPROMO_OID, decode_flag_request, encode_flag_request },
+ { LDB_CONTROL_RELAX_OID, decode_flag_request, encode_flag_request },
{ DSDB_OPENLDAP_DEREFERENCE_CONTROL, decode_openldap_dereference, encode_openldap_dereference },
-/* LDB_CONTROL_RELAX_OID is internal only, and has no network representation */
- { LDB_CONTROL_RELAX_OID, NULL, NULL },
/* DSDB_CONTROL_CURRENT_PARTITION_OID is internal only, and has no network representation */
{ DSDB_CONTROL_CURRENT_PARTITION_OID, NULL, NULL },
/* DSDB_CONTROL_REPLICATED_UPDATE_OID is internal only, and has no network representation */