[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  b8dea2c dsdb simple_ldap_map depends on LDBSAMBA
       via  dab4264 Revert "s4:dsdb - make the RELAX control private"
      from  9f0d1c7 heimdal: Attempt to fix path of hdb_asn1.h

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b8dea2c3272f96ba7910ec44c5b7c4203e4695e2
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Oct 18 10:48:21 2010 +1100

    dsdb simple_ldap_map depends on LDBSAMBA
    
    This shows up at build time on MacOS and runtime on Linux when we
    use the LDAP backend.
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Mon Oct 18 00:57:51 UTC 2010 on sn-devel-104

commit dab426476ffcab92df7fcb2f76064e46b5101d7f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Oct 18 10:24:56 2010 +1100

    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.

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/samdb/ldb_modules/wscript_build |    2 +-
 source4/lib/ldb/include/ldb.h                |   14 ++++++++------
 source4/libcli/ldap/ldap_controls.c          |    3 +--
 3 files changed, 10 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index f5402ba..f6b1e9c 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -132,7 +132,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map',
 	subsystem='ldb',
 	init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
 	internal_module=False,
-	deps='talloc LIBEVENTS ldb LIBNDR'
+	deps='talloc LIBEVENTS ldb LIBNDR LDBSAMBA'
 	)
 
 
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index d346b0f..7f4752e 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 <a href="http://opends.dev.java.net/public/standards/draft-zeilenga-ldap-managedit.txt">draft managedit</a>.
+*/
+#define LDB_CONTROL_RELAX_OID "1.3.6.1.4.1.4203.666.5.12"
+
 /*
    OID for LDAP Extended Operation PASSWORD_CHANGE.
 
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 37ade5b..8cc0a61 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 */


-- 
Samba Shared Repository