The branch, master has been updated
via 8c5df22... Revert "Revert "s4-smbtorture: skip extended SetValue
test against Samba (both dont survive).""
via 7e859be... s4:torture/rpc/dsgetinfo.c: fix name resolving for
ldap_url
from 287304e... Update copyright
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8c5df22ffa4bb57078f4678c60cbec6ac7ba5710
Author: Stefan Metzmacher <me...@samba.org>
Date: Tue Mar 16 12:48:47 2010 +0100
Revert "Revert "s4-smbtorture: skip extended SetValue test against Samba
(both dont survive).""
This reverts commit 508c218eb2f4bf8c45dc9d481576c87ed4fecbd3.
This lets make test fail.
Matthias: please make sure make test still passes when you change things
like
this...(maybe add something to knownfail or so)
metze
commit 7e859be26ac1ba1154eb5b39e0467ca48a66cbf4
Author: Stefan Metzmacher <me...@samba.org>
Date: Tue Mar 16 14:25:11 2010 +0100
s4:torture/rpc/dsgetinfo.c: fix name resolving for ldap_url
metze
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/dsgetinfo.c | 7 ++++++-
source4/torture/rpc/winreg.c | 14 +++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/dsgetinfo.c b/source4/torture/rpc/dsgetinfo.c
index 2745804..3c3e293 100644
--- a/source4/torture/rpc/dsgetinfo.c
+++ b/source4/torture/rpc/dsgetinfo.c
@@ -67,7 +67,7 @@ struct DsGetinfoTest {
*/
static const char *torture_get_ldap_base_dn(struct torture_context *tctx,
struct dcerpc_pipe *p)
{
- const char *hostname = p->binding->target_hostname;
+ const char *hostname = p->binding->host;
struct ldb_context *ldb;
const char *ldap_url = talloc_asprintf(p, "ldap://%s";, hostname);
const char *attrs[] = { "defaultNamingContext", NULL };
@@ -82,6 +82,11 @@ static const char *torture_get_ldap_base_dn(struct
torture_context *tctx, struct
return NULL;
}
+ if (ldb_set_opaque(ldb, "loadparm", tctx->lp_ctx)) {
+ talloc_free(ldb);
+ return NULL;
+ }
+
ret = ldb_connect(ldb, ldap_url, 0, NULL);
if (ret != LDB_SUCCESS) {
torture_comment(tctx, "Failed to make LDB connection to
target");
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 6057abb..651721c 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2035,8 +2035,9 @@ static bool test_SetValue_extended(struct dcerpc_pipe *p,
};
int t, l;
- if (torture_setting_bool(tctx, "samba3", false)) {
- torture_skip(tctx, "skipping extended SetValue test against
Samba 3");
+ if (torture_setting_bool(tctx, "samba3", false) ||
+ torture_setting_bool(tctx, "samba4", false)) {
+ torture_skip(tctx, "skipping extended SetValue test against
Samba");
}
torture_comment(tctx, "Testing SetValue (extended formats)\n");
@@ -2143,13 +2144,8 @@ static bool test_Open(struct torture_context *tctx,
struct dcerpc_pipe *p,
if (created) {
torture_assert(tctx, test_SetValue_simple(p, tctx, &newhandle),
"simple SetValue test failed");
- if (!test_SetValue_extended(p, tctx, &newhandle)) {
- if (torture_setting_bool(tctx, "samba3", false)) {
- torture_warning(tctx, "extended SetValue test
failed");
- } else {
- torture_fail(tctx, "extended SetValue test
failed");
- }
- }
+ torture_assert(tctx, test_SetValue_extended(p, tctx,
&newhandle),
+ "extended SetValue test failed");
}
if (created && !test_CloseKey(p, tctx, &newhandle))
--
Samba Shared Repository
