[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-667-g774b541

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  774b54141a3549448b7bbc5bc69a661ac525df48 (commit)
       via  26108eb66b4b5d4b339dfc845e8a018190068e81 (commit)
       via  b7ea06850a91b0593178227f713803e9ce98cc47 (commit)
      from  361b9f43fb2abb64f2cbae7740b89a616a3c2646 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 774b54141a3549448b7bbc5bc69a661ac525df48
Merge: 26108eb66b4b5d4b339dfc845e8a018190068e81 361b9f43fb2abb64f2cbae7740b89a616a3c2646
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Feb 9 14:03:25 2008 +1100

    Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local

commit 26108eb66b4b5d4b339dfc845e8a018190068e81
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Feb 9 14:02:14 2008 +1100

    Give a more useful error when the templates.ldb can't be found.
    
    Andrew Bartlett

commit b7ea06850a91b0593178227f713803e9ce98cc47
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Feb 9 14:01:37 2008 +1100

    Make the provision test more real, use a foo.example.com for the realm.
    
    Andrew Bartlett

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

Summary of changes:
 source/dsdb/samdb/samdb.c       |    6 ++++--
 source/selftest/samba4_tests.sh |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/samdb/samdb.c b/source/dsdb/samdb/samdb.c
index c11eea1..a01e442 100644
--- a/source/dsdb/samdb/samdb.c
+++ b/source/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;
 		}
 		
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 17b6020..d00b492 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -330,5 +330,5 @@ then
 	rm -rf $PREFIX/upgrade
 	plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
 	rm -rf $PREFIX/provision
-	plantest "blackbox.provision.py" none $PYTHON ./setup/provision.py $CONFIGURATION --domain=FOO --realm=foo --targetdir=$PREFIX/provision
+	plantest "blackbox.provision.py" none $PYTHON ./setup/provision.py $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/provision
 fi


-- 
Samba Shared Repository