From 8d99b398d923d924088d4682a97bae38ccda0b0d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 6 Jul 2012 20:41:10 +1000 Subject: pyldb: Fix dn concat operation to be the other way around This now concatonates Dn(ldb, "cn=config") + Dn(ldb, "dc=samba,dc=org") as "cn=config,dc=samba,dc=org" Andrew Bartlett --- lib/ldb/pyldb.c | 2 +- lib/ldb/tests/python/api.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c index 4554886e8d..9c8a70b529 100644 --- a/lib/ldb/pyldb.c +++ b/lib/ldb/pyldb.c @@ -629,7 +629,7 @@ static PyObject *py_ldb_dn_concat(PyLdbDnObject *self, PyObject *py_other) } py_ret->mem_ctx = talloc_new(NULL); py_ret->dn = ldb_dn_copy(py_ret->mem_ctx, dn); - ldb_dn_add_child(py_ret->dn, other); + ldb_dn_add_base(py_ret->dn, other); return (PyObject *)py_ret; } diff --git a/lib/ldb/tests/python/api.py b/lib/ldb/tests/python/api.py index 7cd8f0364e..d04d0cc5ed 100755 --- a/lib/ldb/tests/python/api.py +++ b/lib/ldb/tests/python/api.py @@ -414,7 +414,7 @@ class DnTests(TestCase): def test_add(self): x = ldb.Dn(self.ldb, "dc=foo24") y = ldb.Dn(self.ldb, "bar=bla") - self.assertEquals("dc=foo24,bar=bla", str(y + x)) + self.assertEquals("dc=foo24,bar=bla", str(x + y)) def test_parse_ldif(self): msgs = self.ldb.parse_ldif("dn: foo=bar\n") -- cgit