summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-09 15:04:03 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-09 15:04:03 +0100
commitd1b40b4ee52132fade72a219d0776c326a53efaf (patch)
treec15e5af38a45445cb538c1bb7f0b10e077e4123b
parentbe2be0779e118534b234971f668bc05f833ba8a7 (diff)
parent655ec1aa063a103f8fc2da6396c58faa09afc38a (diff)
downloadsamba-d1b40b4ee52132fade72a219d0776c326a53efaf.tar.gz
samba-d1b40b4ee52132fade72a219d0776c326a53efaf.tar.bz2
samba-d1b40b4ee52132fade72a219d0776c326a53efaf.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit f7521525e42d62e96cc6f55fb1b23644a60fc36d)
-rw-r--r--source4/dsdb/samdb/samdb.c6
-rw-r--r--source4/libnet/libnet_become_dc.c4
-rwxr-xr-xsource4/selftest/samba4_tests.sh2
-rw-r--r--testprogs/ejs/minschema_classes.txt2
4 files changed, 9 insertions, 5 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;
}
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index f2c1f70bfc..c9185c749b 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1514,10 +1514,10 @@ static void becomeDC_drsuapi_connect_send(struct libnet_BecomeDC_state *s,
if (!drsuapi->binding) {
if (lp_parm_bool(s->libnet->lp_ctx, NULL, "become_dc", "print", false)) {
- binding_str = talloc_asprintf(s, "ncacn_ip_tcp:%s[krb5,print,seal]", s->source_dsa.dns_name);
+ binding_str = talloc_asprintf(s, "ncacn_ip_tcp:%s[print,seal]", s->source_dsa.dns_name);
if (composite_nomem(binding_str, c)) return;
} else {
- binding_str = talloc_asprintf(s, "ncacn_ip_tcp:%s[krb5,seal]", s->source_dsa.dns_name);
+ binding_str = talloc_asprintf(s, "ncacn_ip_tcp:%s[seal]", s->source_dsa.dns_name);
if (composite_nomem(binding_str, c)) return;
}
c->status = dcerpc_parse_binding(s, binding_str, &drsuapi->binding);
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 17b6020abb..d00b492953 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/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
diff --git a/testprogs/ejs/minschema_classes.txt b/testprogs/ejs/minschema_classes.txt
index 9327a4af2f..30f5b8ce96 100644
--- a/testprogs/ejs/minschema_classes.txt
+++ b/testprogs/ejs/minschema_classes.txt
@@ -37,3 +37,5 @@ groupPolicyContainer
ipsecPolicy
ipsecISAKMPPolicy
ipsecNFA
+ipsecFilter
+ipsecNegotiationPolicy