ldb: Fix error string when renaming to an DN that already exists
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Mar 2016 01:07:22 +0000 (14:07 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 9 May 2016 23:43:14 +0000 (01:43 +0200)
We were printing the DN renamed from, not the DN being renamed to.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
lib/ldb/ldb_tdb/ldb_tdb.c

index 8d1fd3600142e77854c1b01c380bab27a26271ff..6a91f053f64d722f068b8459942f43fc579c0e07 100644 (file)
@@ -1054,7 +1054,7 @@ static int ltdb_rename(struct ltdb_context *ctx)
                        talloc_free(tdb_key.dptr);
                        ldb_asprintf_errstring(ldb_module_get_ctx(module),
                                               "Entry %s already exists",
-                                              ldb_dn_get_linearized(msg->dn));
+                                              ldb_dn_get_linearized(req->op.rename.newdn));
                        /* finding the new record already in the DB is an error */
                        talloc_free(msg);
                        return LDB_ERR_ENTRY_ALREADY_EXISTS;