Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 9 Feb 2008 14:04:03 +0000 (15:04 +0100)
source/dsdb/samdb/samdb.c
source/libnet/libnet_become_dc.c
source/selftest/samba4_tests.sh
testprogs/ejs/minschema_classes.txt

index c11eea1757c99a0649c6f79251d6aba413eeb010..a01e4425878a4e134c75b6b6f55f6d9fb5fb8eb7 100644 (file)
@@ -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;
                }
                
index f2c1f70bfccfb579898e7f52dacce26e9975b968..c9185c749b4bf0181b0a58437a6f1c2f07dfcfa4 100644 (file)
@@ -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);
index 17b6020abb077266115687682f8ed2a6e8308a04..d00b49295375e9d4635aa1c395ea89575391a6d4 100755 (executable)
@@ -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
index 9327a4af2f77c84053e1c1e0f6416fc4b7ae4119..30f5b8ce96b144b190d8ed60a0c3b51f393fc7cc 100644 (file)
@@ -37,3 +37,5 @@ groupPolicyContainer
 ipsecPolicy
 ipsecISAKMPPolicy
 ipsecNFA
+ipsecFilter
+ipsecNegotiationPolicy