ldb:ldb_rename on ldap backends - handle the case when the RDN value is empty

Otherwise we get "<RDN name>=(null),..."

diff --git a/source4/lib/ldb-samba/ldb_ildap.c b/source4/lib/ldb-samba/ldb_ildap.c
index e2176d65d3ce5f02bcd2e55cd7a0f848549a3dd1..3c28690bd66edd1db09fb49e268db280a90663b5 100644 (file)
--- a/source4/lib/ldb-samba/ldb_ildap.c
+++ b/source4/lib/ldb-samba/ldb_ildap.c
@@ -633,7 +633,7 @@ static int ildb_rename(struct ildb_context *ac)
        if ((rdn_name != NULL) && (rdn_val != NULL)) {
                msg->r.ModifyDNRequest.newrdn =
                        talloc_asprintf(msg, "%s=%s", rdn_name,
-                               ldb_dn_escape_value(msg, *rdn_val));
+                                       rdn_val->length > 0 ? ldb_dn_escape_value(msg, *rdn_val) : "");
        } else {
                msg->r.ModifyDNRequest.newrdn = talloc_strdup(msg, "");
        }

diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
index ee677cce94a71173f3a47a4a0ee7dea21b8091ca..b328ebf7e3215c52da385cbd7f5038e88712376d 100644 (file)
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -410,7 +410,7 @@ static int lldb_rename(struct lldb_context *lldb_ac)
 
        if ((rdn_name != NULL) && (rdn_val != NULL)) {
                newrdn = talloc_asprintf(lldb_ac, "%s=%s", rdn_name,
-                                        ldb_dn_escape_value(lldb, *rdn_val));
+                                        rdn_val->length > 0 ? ldb_dn_escape_value(lldb, *rdn_val) : "");
        } else {
                newrdn = talloc_strdup(lldb_ac, "");
        }