[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Mon Nov 16 09:02:13 MST 2009


The branch, master has been updated
       via  e853dd7... Revert "s4:dsdb/repl/replicated_objects - Applicate also here the new "lDAPDisplayName" generator"
      from  adff5ef... README.Coding: add section about usage of helper variables

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


- Log -----------------------------------------------------------------
commit e853dd763b56870643b135d3252ab0b3eaf25a00
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Nov 16 17:01:43 2009 +0100

    Revert "s4:dsdb/repl/replicated_objects - Applicate also here the new "lDAPDisplayName" generator"
    
    This reverts commit df95d5c29292968b465bff24c3cf78800677a4d4.
    
    abartlet pointed out in a post on the samba-technical list that this isn't
    necessary at all (lDAPDisplayName normalisation algorithm). Rather it breaks
    functionality of the replication.

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

Summary of changes:
 source4/dsdb/repl/replicated_objects.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 043c620..020d5f1 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -153,10 +153,7 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
 		struct ldb_message_element *el;
 		el = ldb_msg_find_element(msg, rdn_attr->lDAPDisplayName);
 		if (!el) {
-			/* we assume that the RDN has prefix "CN" */
-			ret = ldb_msg_add_string(msg, rdn_attr->lDAPDisplayName,
-				samdb_cn_to_lDAPDisplayName(mem_ctx,
-					(const char *) rdn_value->data));
+			ret = ldb_msg_add_value(msg, rdn_attr->lDAPDisplayName, rdn_value, NULL);
 			if (ret != LDB_SUCCESS) {
 				return WERR_FOOBAR;
 			}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list