The branch, master has been updated
via 3983515 s3-docs: add delete_lost option to vfs_streams_depot.8
via f5a7bc2 s3-docs: Fix opening and ending tag mismatch in
Samba3-HOWTO (Bug #9235)
via 9a6f648 s4: samba_backup: Fix typos.
via 9837fd8 s4:tortore/rpc/lsa: make more use of torture_assert*
from 6245c5c wintest: Give dcpromo more time
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3983515a0d2222c9e559d83f37ec0a4c5820b56d
Author: Björn Baumbach <b...@sernet.de>
Date: Tue Oct 2 11:37:11 2012 +0200
s3-docs: add delete_lost option to vfs_streams_depot.8
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Autobuild-User(master): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(master): Wed Oct 3 18:10:14 CEST 2012 on sn-devel-104
commit f5a7bc26648e5edd2d0958c50a4432f14f5ce727
Author: Björn Baumbach <b...@sernet.de>
Date: Tue Oct 2 10:53:15 2012 +0200
s3-docs: Fix opening and ending tag mismatch in Samba3-HOWTO (Bug #9235)
Signed-off-by: Stefan Metzmacher <me...@samba.org>
commit 9a6f648122c274cc93fd8edff8616c9ffffeb6aa
Author: Björn Baumbach <b...@sernet.de>
Date: Wed Sep 19 12:03:21 2012 +0200
s4: samba_backup: Fix typos.
Signed-off-by: Stefan Metzmacher <me...@samba.org>
commit 9837fd8cc6f0a46817dcfbf9ad2dfd3bfecbe543
Author: Stefan Metzmacher <me...@samba.org>
Date: Mon Oct 1 08:51:47 2012 +0200
s4:tortore/rpc/lsa: make more use of torture_assert*
Currently samba3.rpc.lsa.privileges.lsa.Privileges(s3dc)
seems to be flakey.
We may be able to find the bug with this,
or at least mark it as flapping.
metze
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml | 3 +-
docs-xml/manpages/vfs_streams_depot.8.xml | 19 ++++++
source4/scripting/bin/samba_backup | 4 +-
source4/torture/rpc/lsa.c | 87 +++++++++++++---------------
4 files changed, 62 insertions(+), 51 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
index 0698ced..f2f3a30 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
@@ -749,8 +749,7 @@ The basic options shown in <link linkend="pdc-example">this
example</link> are e
The parameters <emphasis>domain logons</emphasis>
parameter is the key parameter indicating domain
control and network logon support.
- </para>
-
+ </para></listitem>
</varlistentry>
<varlistentry><term>Environment Parameters </term>
diff --git a/docs-xml/manpages/vfs_streams_depot.8.xml
b/docs-xml/manpages/vfs_streams_depot.8.xml
index 78b5fd3..639428b 100644
--- a/docs-xml/manpages/vfs_streams_depot.8.xml
+++ b/docs-xml/manpages/vfs_streams_depot.8.xml
@@ -52,6 +52,25 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>streams_depot:delete_lost = [ yes | no ]</term>
+ <listitem>
+ <para>In the case of an already existing data streams directory
+ for a newly created file the streams directory will be renamed
+ to "lost-%lu", random(). With this option lost stream
directories
+ will be removed instead of renamed.</para>
+ <itemizedlist>
+ <listitem><para>
+ <command>no(default)</command> - rename lost streams to
+ "lost-%lu", random().
+ </para></listitem>
+ <listitem><para>
+ <command>yes</command> - remove lost streams.
+ </para></listitem>
+ </itemizedlist>
+ </listitem>
+ </varlistentry>
+
</variablelist>
</refsect1>
diff --git a/source4/scripting/bin/samba_backup
b/source4/scripting/bin/samba_backup
index 75ebec6..8f9cc83 100755
--- a/source4/scripting/bin/samba_backup
+++ b/source4/scripting/bin/samba_backup
@@ -35,12 +35,12 @@ DAYS=90
WHEN=`date +%d%m%y`
if [ ! -d $WHERE ]; then
- echo "Missing backup directorty $WHERE"
+ echo "Missing backup directory $WHERE"
exit 1
fi
if [ ! -d $FROMWHERE ]; then
- echo "Missing or wrong provision directorty $FROMWHERE"
+ echo "Missing or wrong provision directory $FROMWHERE"
exit 1
fi
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index edd3a0c..107af11 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -158,9 +158,7 @@ bool test_lsa_OpenPolicy2_ex(struct dcerpc_binding_handle
*b,
torture_comment(tctx, "\nTesting OpenPolicy2\n");
*handle = talloc(tctx, struct policy_handle);
- if (!*handle) {
- return false;
- }
+ torture_assert(tctx, *handle != NULL, "talloc(tctx, struct
policy_handle)");
qos.len = 0;
qos.impersonation_level = 2;
@@ -317,36 +315,37 @@ static bool test_LookupNames(struct dcerpc_binding_handle
*b,
tnames->names[i].name.string);
}
}
- torture_comment(tctx, "LookupNames failed - %s\n",
- nt_errstr(r.out.result));
- return false;
+ torture_assert_ntstatus_ok(tctx, r.out.result,
+ "LookupNames failed");
} else if (!NT_STATUS_IS_OK(r.out.result)) {
- torture_comment(tctx, "LookupNames failed - %s\n",
- nt_errstr(r.out.result));
- return false;
+ torture_assert_ntstatus_ok(tctx, r.out.result,
+ "LookupNames failed");
}
for (i=0;i< r.in.num_names;i++) {
- if (i < count) {
- if (sids.sids[i].sid_type !=
tnames->names[input_idx[i]].sid_type) {
- torture_comment(tctx, "LookupName of %s got
unexpected name type: %s\n",
-
tnames->names[input_idx[i]].name.string,
-
sid_type_lookup(sids.sids[i].sid_type));
- return false;
- }
- if ((sids.sids[i].sid_type == SID_NAME_DOMAIN) &&
- (sids.sids[i].rid != (uint32_t)-1)) {
- torture_comment(tctx, "LookupName of %s got
unexpected rid: %d\n",
-
tnames->names[input_idx[i]].name.string, sids.sids[i].rid);
- return false;
- }
- } else if (i >=count) {
- torture_comment(tctx, "LookupName of %s failed to
return a result\n",
- tnames->names[input_idx[i]].name.string);
- return false;
+ torture_assert(tctx, (i < count),
+ talloc_asprintf(tctx,
+ "LookupName of %s failed to return a result\n",
+ tnames->names[input_idx[i]].name.string));
+
+ torture_assert_int_equal(tctx,
+ sids.sids[i].sid_type,
+ tnames->names[input_idx[i]].sid_type,
+ talloc_asprintf(tctx,
+ "LookupName of %s got unexpected name
type: %s\n",
+
tnames->names[input_idx[i]].name.string,
+
sid_type_lookup(sids.sids[i].sid_type)));
+ if (sids.sids[i].sid_type != SID_NAME_DOMAIN) {
+ continue;
}
+ torture_assert_int_equal(tctx,
+ sids.sids[i].rid,
+ UINT32_MAX,
+ talloc_asprintf(tctx,
+ "LookupName of %s got unexpected rid:
%d\n",
+
tnames->names[input_idx[i]].name.string,
+ sids.sids[i].rid));
}
- torture_comment(tctx, "\n");
return true;
}
@@ -767,11 +766,9 @@ static bool test_LookupSids(struct dcerpc_binding_handle
*b,
torture_assert_ntstatus_ok(tctx, dcerpc_lsa_LookupSids_r(b, tctx, &r),
"LookupSids failed");
- if (!NT_STATUS_IS_OK(r.out.result) &&
- !NT_STATUS_EQUAL(r.out.result, STATUS_SOME_UNMAPPED)) {
- torture_comment(tctx, "LookupSids failed - %s\n",
- nt_errstr(r.out.result));
- return false;
+ if (!NT_STATUS_EQUAL(r.out.result, STATUS_SOME_UNMAPPED)) {
+ torture_assert_ntstatus_ok(tctx, r.out.result,
+ "LookupSids failed");
}
torture_comment(tctx, "\n");
@@ -1338,10 +1335,8 @@ static bool test_Delete(struct dcerpc_binding_handle *b,
r.in.handle = handle;
torture_assert_ntstatus_ok(tctx, dcerpc_lsa_Delete_r(b, tctx, &r),
"Delete failed");
- if (!NT_STATUS_EQUAL(r.out.result, NT_STATUS_NOT_SUPPORTED)) {
- torture_comment(tctx, "Delete should have failed
NT_STATUS_NOT_SUPPORTED - %s\n", nt_errstr(r.out.result));
- return false;
- }
+ torture_assert_ntstatus_equal(tctx, r.out.result,
NT_STATUS_NOT_SUPPORTED,
+ "Delete should have failed NT_STATUS_NOT_SUPPORTED");
return true;
}
@@ -3583,46 +3578,44 @@ struct torture_suite
*torture_rpc_lsa_trusted_domains(TALLOC_CTX *mem_ctx)
static bool testcase_Privileges(struct torture_context *tctx,
struct dcerpc_pipe *p)
{
- bool ret = true;
struct policy_handle *handle;
struct dcerpc_binding_handle *b = p->binding_handle;
if (p->binding->transport != NCACN_NP &&
p->binding->transport != NCALRPC) {
- torture_comment(tctx, "testcase_Privileges is only available "
+ torture_skip(tctx, "testcase_Privileges is only available "
"over NCACN_NP or NCALRPC");
- return true;
}
if (!test_OpenPolicy(b, tctx)) {
- ret = false;
+ return false;
}
if (!test_lsa_OpenPolicy2(b, tctx, &handle)) {
- ret = false;
+ return false;
}
if (!handle) {
- ret = false;
+ return false;
}
if (!test_CreateAccount(b, tctx, handle)) {
- ret = false;
+ return false;
}
if (!test_EnumAccounts(b, tctx, handle)) {
- ret = false;
+ return false;
}
if (!test_EnumPrivs(b, tctx, handle)) {
- ret = false;
+ return false;
}
if (!test_lsa_Close(b, tctx, handle)) {
- ret = false;
+ return false;
}
- return ret;
+ return true;
}
--
Samba Shared Repository
