summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-02-09 14:13:58 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-02-09 14:13:58 +1100
commita5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521 (patch)
treebc204af36200a4481d2f9fc158471267d47d4454 /source4/dsdb
parentd08eabdf91cade7f034468811d6228e75c69c1b5 (diff)
parentfa2eb3447361457557d84ed8afd0757638410584 (diff)
downloadsamba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.tar.gz
samba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.tar.bz2
samba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.zip
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 4aff02ecf18d52ae8e64e0c938ac5edf82a6dcef)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/samdb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index c11eea1757..a01e442587 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -103,8 +103,8 @@ int samdb_copy_template(struct ldb_context *ldb,
if (!templates_ldb) {
templates_ldb_path = samdb_relative_path(ldb,
- msg,
- "templates.ldb");
+ msg,
+ "templates.ldb");
if (!templates_ldb_path) {
*errstring = talloc_asprintf(msg, "samdb_copy_template: ERROR: Failed to contruct path for template db");
return LDB_ERR_OPERATIONS_ERROR;
@@ -115,6 +115,8 @@ int samdb_copy_template(struct ldb_context *ldb,
NULL, 0, NULL);
talloc_free(templates_ldb_path);
if (!templates_ldb) {
+ *errstring = talloc_asprintf(msg, "samdb_copy_template: ERROR: Failed to connect to templates db at: %s",
+ templates_ldb_path);
return LDB_ERR_OPERATIONS_ERROR;
}