samba.git
9 months agotraffic_replay: Change print() to use logger()
Tim Beale [Tue, 16 Oct 2018 22:26:28 +0000 (11:26 +1300)]
traffic_replay: Change print() to use logger()

This reduces noise, so the messages only come out if you specify
--debug.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
9 months agotraffic_replay: Generate users faster by writing to local DB
Tim Beale [Thu, 11 Oct 2018 01:47:28 +0000 (14:47 +1300)]
traffic_replay: Generate users faster by writing to local DB

We can create user accounts much faster if the LDB connection talks
directly to the local sam.ldb file rather than going via LDAP. This
patch allows the 'host' argument to the tool to be a .ldb file (e.g.
"/usr/local/samba/private/sam.ldb") instead of a server name/IP.

In most cases, the traffic_replay tool wants to run on a remote device
(because the point of it is to send traffic to the DC). However, the
--generate-users-only is one case where the tool can be run locally,
directly on the test DC. (The traffic_replay user generation is handy
for standalone testing, because it also handles assigning group
memberships to the generated user accounts).

Note that you also need to use '--option="ldb:nosync = true"' to get
the improvement in performance.

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
9 months agodsdb group audit tests: log_membership_changes extra tests
Gary Lockyer [Wed, 24 Oct 2018 21:52:55 +0000 (10:52 +1300)]
dsdb group audit tests: log_membership_changes extra tests

Add extra tests to ensure better test coverage of log_membership_changes

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Oct 30 20:20:26 CET 2018 on sn-devel-144

9 months agodsdb group audit tests: check_version improve diagnostics
Gary Lockyer [Thu, 25 Oct 2018 01:38:31 +0000 (14:38 +1300)]
dsdb group audit tests: check_version improve diagnostics

Change check_version to display the expected, actual along with the
line and name of the failing test, rather than the line in check_version

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
9 months agodsdb group audit tests: check_timestamp improve diagnostics
Gary Lockyer [Thu, 25 Oct 2018 00:28:09 +0000 (13:28 +1300)]
dsdb group audit tests: check_timestamp improve diagnostics

Change check_timestamp to display the expected, actual along with the
line and name of the failing test, rather than the line in
check_timestamp.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
9 months agodsdb group audit: align dn_compare with memcmp
Gary Lockyer [Wed, 24 Oct 2018 21:52:27 +0000 (10:52 +1300)]
dsdb group audit: align dn_compare with memcmp

Rename the parameter names and adjust the  return codes from dn_compare
so that:
dn_compare(a, b) =>

LESS_THAN means a is less than b.
GREATER_THAN means a is greater than b.

Thanks to metze for suggesting the correct semantics for dn_compare

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13664

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
9 months agodsdb group_audit: Test to replicate BUG 13664
Gary Lockyer [Tue, 23 Oct 2018 04:14:34 +0000 (17:14 +1300)]
dsdb group_audit: Test to replicate BUG 13664

The group audit code incorrectly logs member additions and deletions.

Thanks to metze for the debugging that isolated the issue, and for
suggesting the fix to dn_compare.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13664

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
9 months agodsdb: Add comments explaining the limitations of our current backlink behaviour
Andrew Bartlett [Tue, 30 Oct 2018 02:56:43 +0000 (15:56 +1300)]
dsdb: Add comments explaining the limitations of our current backlink behaviour

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Tim Beale <timbeale@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Tue Oct 30 10:32:51 CET 2018 on sn-devel-144

9 months agos4:samldb: internally use extended dns while changing the primaryGroupID field
Stefan Metzmacher [Fri, 24 Aug 2018 13:33:49 +0000 (15:33 +0200)]
s4:samldb: internally use extended dns while changing the primaryGroupID field

This is important, otherwise we'll loose the <SID=> component of the
linked attribute.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agos4:repl_meta_data: add support for DSDB_CONTROL_DBCHECK_FIX_LINK_DN_SID
Stefan Metzmacher [Fri, 12 Oct 2018 13:56:18 +0000 (15:56 +0200)]
s4:repl_meta_data: add support for DSDB_CONTROL_DBCHECK_FIX_LINK_DN_SID

This will be used by dbcheck in the next commits.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agos4:repl_meta_data: pass down struct replmd_replicated_request to replmd_modify_la_rep...
Stefan Metzmacher [Fri, 12 Oct 2018 16:43:25 +0000 (18:43 +0200)]
s4:repl_meta_data: pass down struct replmd_replicated_request to replmd_modify_la_replace()

This will simplify further changes.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agos4:repl_meta_data: pass down struct replmd_replicated_request to replmd_modify_la_del...
Stefan Metzmacher [Fri, 12 Oct 2018 16:43:25 +0000 (18:43 +0200)]
s4:repl_meta_data: pass down struct replmd_replicated_request to replmd_modify_la_delete()

This will simplify further changes.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agos4:repl_meta_data: add missing \n to a DEBUG message in replmd_modify_la_add()
Stefan Metzmacher [Fri, 12 Oct 2018 17:34:08 +0000 (19:34 +0200)]
s4:repl_meta_data: add missing \n to a DEBUG message in replmd_modify_la_add()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agos4:repl_meta_data: pass down struct replmd_replicated_request to replmd_modify_la_add()
Stefan Metzmacher [Fri, 12 Oct 2018 16:43:25 +0000 (18:43 +0200)]
s4:repl_meta_data: pass down struct replmd_replicated_request to replmd_modify_la_add()

This will simplify further changes.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agos4:repl_meta_data: pass down struct replmd_replicated_request to replmd_modify_handle...
Stefan Metzmacher [Fri, 12 Oct 2018 16:43:25 +0000 (18:43 +0200)]
s4:repl_meta_data: pass down struct replmd_replicated_request to replmd_modify_handle_linked_attribs()

This will simplify further changes.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agoblackbox/dbcheck-links: Test broken links with missing <SID=...> on linked attributes
Stefan Metzmacher [Fri, 12 Oct 2018 13:56:18 +0000 (15:56 +0200)]
blackbox/dbcheck-links: Test broken links with missing <SID=...> on linked attributes

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agodbchecker: Fix missing <SID=...> on linked attributes
Stefan Metzmacher [Fri, 12 Oct 2018 13:56:18 +0000 (15:56 +0200)]
dbchecker: Fix missing <SID=...> on linked attributes

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agodbchecker: improve verbose output of do_modify()
Stefan Metzmacher [Mon, 8 Oct 2018 15:14:28 +0000 (17:14 +0200)]
dbchecker: improve verbose output of do_modify()

This makes it easier to debug dbcheck problems.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agos4:dsdb: add DSDB_CONTROL_DBCHECK_FIX_LINK_DN_SID oid
Stefan Metzmacher [Mon, 8 Oct 2018 15:13:52 +0000 (17:13 +0200)]
s4:dsdb: add DSDB_CONTROL_DBCHECK_FIX_LINK_DN_SID oid

This will be used to fix missing <SID=> components in future.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agotestprogs/blackbox: add samba4.blackbox.test_primary_group test
Stefan Metzmacher [Tue, 16 Oct 2018 13:16:18 +0000 (15:16 +0200)]
testprogs/blackbox: add samba4.blackbox.test_primary_group test

This demonstrates the bug, that happens when the primaryGroupID
of a user is changed.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13418

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agos4:dsdb: fix comment on DSDB_CONTROL_DBCHECK_FIX_LINK_DN_NAME
Stefan Metzmacher [Mon, 8 Oct 2018 15:13:13 +0000 (17:13 +0200)]
s4:dsdb: fix comment on DSDB_CONTROL_DBCHECK_FIX_LINK_DN_NAME

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agoschema_samba4.ldif: add allocation of DSDB_CONTROL_DBCHECK_FIX_LINK_DN_NAME
Stefan Metzmacher [Mon, 8 Oct 2018 13:35:52 +0000 (15:35 +0200)]
schema_samba4.ldif: add allocation of DSDB_CONTROL_DBCHECK_FIX_LINK_DN_NAME

This was already allocated in source4/dsdb/samdb/samdb.h with
commit 22208f52e6096fbe9413b8ff339d9446851e0874.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
9 months agotdb: Make record deletion circular-chain safe
Volker Lendecke [Wed, 24 Oct 2018 12:31:34 +0000 (14:31 +0200)]
tdb: Make record deletion circular-chain safe

Before this patch we had 3 loops walking a hash chain to delete
records:

tdb_do_delete() to find the predecessor of the record that was to be
deleted. tdb_count_dead(), the name says it all and tdb_purge_dead()
to give back all dead records from a chain to the freelist.

This patch introduces tdb_trim_dead that walks a hash chain just
once. While it does so it counts the number of dead records, and all
records beyond tdb->max_dead_records are moved to the freelist.

Normal record deletion now works by always marking a record as dead in
step 1 and then calling tdb_trim_dead. This is made safe against
circular chains by doing the slow chain walk only in the case when we
did not delete a dead record during our walk.

It changes our dynamics a bit:

When deleting a record with non-zero max_dead_records, now we always
leave that number of records around when deleting, doing a blocking
lock on the freelist when we found too many dead records.

Previously when exceeding max_dead_records we wiped all dead records
to start accumulating them from scratch, assuming we could lock the
freelist in a nonblocking fashion.

The net effect for an uncontended freelist is the same: In
tdb_allocate() we still completely hand over all dead records to the
freelist when we could lock it, it just happens later than without
this patch.

This means for a lightly loaded system we will potentially leave more
dead records around in databases like locking.tdb. However, on a
heavily loaded system we become more predictable: If the freelist is
so heavily contended that across many deletes we can't get hold of it,
previously we accumulated more dead records than max_dead_records
would allow. This is a really lowlevel tradeoff that is likely hard to
measure, but to me becoming more deterministic without sacrificing too
much parallelism (we keep more dead records around) is worth trying.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Oct 30 02:48:38 CET 2018 on sn-devel-144

9 months agotdb: Do early RDONLY error check for tdb_delete
Volker Lendecke [Thu, 25 Oct 2018 13:59:48 +0000 (15:59 +0200)]
tdb: Do early RDONLY error check for tdb_delete

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agotdb: Purge dead records whenever we block the freelist
Volker Lendecke [Thu, 25 Oct 2018 13:55:29 +0000 (15:55 +0200)]
tdb: Purge dead records whenever we block the freelist

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agotdb: Don't delete dead records in traverse
Volker Lendecke [Tue, 23 Oct 2018 11:40:34 +0000 (13:40 +0200)]
tdb: Don't delete dead records in traverse

The next commit will change the handling of dead records, removing the
"tdb_do_delete" function. As traverses should not happen in normal
operations, dead records from them should be rare, and relying on
traverses to remove them is a very bad idea IMHO.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agotdb: Align an integer type
Volker Lendecke [Wed, 24 Oct 2018 05:26:49 +0000 (07:26 +0200)]
tdb: Align an integer type

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agotdb: Fix a typo
Volker Lendecke [Thu, 25 Oct 2018 18:53:52 +0000 (20:53 +0200)]
tdb: Fix a typo

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agovfs_fruit: remove check for number of xattrs from ad_convert_xattr
Ralph Boehme [Fri, 19 Oct 2018 10:15:42 +0000 (12:15 +0200)]
vfs_fruit: remove check for number of xattrs from ad_convert_xattr

Turns out that there exist AppleDouble files with an extended FinderInfo
entry that includes the xattr marshall buffer, but the count of xattrs
in the buffer is just zero.

We do want to discard this extended FinderInfo entry and convert it to a
simple fixed size FinderInfo entry, so remove the check.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13649

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agopython: do not use "is" for string equality
Douglas Bagnall [Fri, 26 Oct 2018 07:25:59 +0000 (20:25 +1300)]
python: do not use "is" for string equality

This is not always going to work, and is not guaranteed to be
consistent even between minor versions.

Here is a simple counterexample:

>>> a = 'hello'
>>> a is 'hello'
True
>>> a is 'hello'.lower()
False
>>> a == a.lower()
True

Possibly it always works for the empty string, but we cannot rely
on that.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Oct 29 23:13:36 CET 2018 on sn-devel-144

9 months agopython/samdb: properly use property()
Douglas Bagnall [Thu, 25 Oct 2018 09:09:59 +0000 (22:09 +1300)]
python/samdb: properly use property()

Python's property() function works like this:

property([getter[, setter[, delete[, doc]]]])

but we have been forgetting the delete function, or rather setting it
to be a string. A string is not callable and is unlikely to succeed at
deleting the property.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
9 months agos3:winbind: Check return code of initialize_password_db()
Andreas Schneider [Mon, 29 Oct 2018 18:45:58 +0000 (19:45 +0100)]
s3:winbind: Check return code of initialize_password_db()

See https://retrace.fedoraproject.org/faf/reports/1577174/

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13668

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agolib:socket: If returning early, set ifaces
David Mulder [Wed, 24 Oct 2018 16:55:02 +0000 (10:55 -0600)]
lib:socket: If returning early, set ifaces

Prevents a segfault in load_interfaces() when total interfaces == 1.
Fixes regression caused by da68a1b2f417ec82ea4ed3e7a4d867cef8ca8f93.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13665

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Ralph Böhme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Sun Oct 28 00:35:35 CEST 2018 on sn-devel-144

9 months agolib: Remove unused tdb_trans_* functions
Volker Lendecke [Tue, 25 Sep 2018 15:59:20 +0000 (08:59 -0700)]
lib: Remove unused tdb_trans_* functions

The transactions have all moved to dbwrap

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agos3:torture: Rename the test file and remove it if it exists
Andreas Schneider [Fri, 19 Oct 2018 13:24:14 +0000 (15:24 +0200)]
s3:torture: Rename the test file and remove it if it exists

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agos3:torture: Don't use the same testdir twice
Andreas Schneider [Fri, 19 Oct 2018 12:38:34 +0000 (14:38 +0200)]
s3:torture: Don't use the same testdir twice

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agos3:selftest: Fix test names of smbtorture_s3.plain
Andreas Schneider [Thu, 18 Oct 2018 12:00:13 +0000 (14:00 +0200)]
s3:selftest: Fix test names of smbtorture_s3.plain

The env name will be appended. There is no need to have it twice. Can't
we remove the tests againa ad_dc_ntvfs completely?

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
9 months agos3:utils/smbget fix recursive download with empty source directories
Christian Ambach [Tue, 23 Oct 2018 18:05:04 +0000 (20:05 +0200)]
s3:utils/smbget fix recursive download with empty source directories

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13199
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Oct 26 09:58:07 CEST 2018 on sn-devel-144

9 months agos3:utils/smbget add error handling for mkdir() calls
Christian Ambach [Mon, 22 Oct 2018 14:28:21 +0000 (16:28 +0200)]
s3:utils/smbget add error handling for mkdir() calls

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
9 months agos3:script/tests reduce code duplication
Christian Ambach [Mon, 22 Oct 2018 14:22:00 +0000 (16:22 +0200)]
s3:script/tests reduce code duplication

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
9 months agopytests/samba3sam: unshadow and fix a search_non_mapped test
Douglas Bagnall [Thu, 11 Oct 2018 22:52:49 +0000 (11:52 +1300)]
pytests/samba3sam: unshadow and fix a search_non_mapped test

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Fri Oct 26 00:50:37 CEST 2018 on sn-devel-144

9 months agopython/tests/ou: unshadow a test
Douglas Bagnall [Thu, 11 Oct 2018 01:45:58 +0000 (14:45 +1300)]
python/tests/ou: unshadow a test

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agosamba-tool tests: fix bytes/str issue in masked test
Douglas Bagnall [Wed, 24 Oct 2018 22:40:53 +0000 (11:40 +1300)]
samba-tool tests: fix bytes/str issue in masked test

This test will be revealed to the world in the next commit.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/raw_protocol: reveal shadowed test via disambiguation
Douglas Bagnall [Thu, 11 Oct 2018 01:42:40 +0000 (14:42 +1300)]
python/tests/raw_protocol: reveal shadowed test via disambiguation

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/dsdb/pytest/ldap_schema: remove duplicate test
Douglas Bagnall [Thu, 11 Oct 2018 04:00:46 +0000 (17:00 +1300)]
s4/dsdb/pytest/ldap_schema: remove duplicate test

The tests differ in two lines, thus:

     def test_subClassOf(self):
     -        """ Testing usage of custom child schamaClass
     +        """ Testing usage of custom child classSchema

[...]

   -governsId: 1.3.6.1.4.1.7165.4.6.2.6.3.""" + str(random.randint(1, 100000)) + """
   +governsId: 1.3.6.1.4.1.7165.4.6.2.6.7.""" + str(random.randint(1, 100000)) + """

with the governsId OID changed because it was noticed they were colliding.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agoldb/tests/py/api: reveal shadowed casefold test
Douglas Bagnall [Thu, 11 Oct 2018 03:47:44 +0000 (16:47 +1300)]
ldb/tests/py/api: reveal shadowed casefold test

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/kcc_utils: disambiguate/unshadow a test
Douglas Bagnall [Thu, 11 Oct 2018 03:15:43 +0000 (16:15 +1300)]
python/tests/kcc_utils: disambiguate/unshadow a test

Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/lsa_string: remove duplicate method
Douglas Bagnall [Thu, 11 Oct 2018 00:50:06 +0000 (13:50 +1300)]
python/tests/lsa_string: remove duplicate method

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/gp_parse/gp_inf: remove unused variables
Douglas Bagnall [Thu, 25 Oct 2018 09:34:31 +0000 (22:34 +1300)]
python/gp_parse/gp_inf: remove unused variables

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/gp_parse/gp_inf: remove shadowed method
Douglas Bagnall [Thu, 11 Oct 2018 00:23:01 +0000 (13:23 +1300)]
python/gp_parse/gp_inf: remove shadowed method

The 'from_xml()' definition is replaced a few lines down

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/scripting/demodirsync: fix syntax error
Douglas Bagnall [Thu, 11 Oct 2018 05:33:48 +0000 (18:33 +1300)]
s4/scripting/demodirsync: fix syntax error

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/scripting: py3 style 0o123 octal, not 0123
Douglas Bagnall [Thu, 11 Oct 2018 05:32:52 +0000 (18:32 +1300)]
s4/scripting: py3 style 0o123 octal, not 0123

this works with py2.6+ too.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/dsdb/pytest/sort: use compat.cmp_fn instead of cmp
Douglas Bagnall [Thu, 11 Oct 2018 04:23:54 +0000 (17:23 +1300)]
s4/dsdb/pytest/sort: use compat.cmp_fn instead of cmp

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <noel.power@suse.com>
9 months agos4/dsdb/pytest/ad_dc_medley: do not use xrange
Douglas Bagnall [Thu, 11 Oct 2018 04:06:32 +0000 (17:06 +1300)]
s4/dsdb/pytest/ad_dc_medley: do not use xrange

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/dsdb/pytests: Py3 compatitble except clauses
Douglas Bagnall [Thu, 11 Oct 2018 03:52:14 +0000 (16:52 +1300)]
s4/dsdb/pytests: Py3 compatitble except clauses

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agoscript/show_test_time: approach python 3 compatibility
Douglas Bagnall [Thu, 11 Oct 2018 03:04:38 +0000 (16:04 +1300)]
script/show_test_time: approach python 3 compatibility

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/kcc: use compat.cmp_fn (PY3)
Douglas Bagnall [Thu, 11 Oct 2018 00:37:28 +0000 (13:37 +1300)]
python/kcc: use compat.cmp_fn (PY3)

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/remove_dc: use a local variable in offline_remove_server
Douglas Bagnall [Thu, 11 Oct 2018 00:07:30 +0000 (13:07 +1300)]
python/remove_dc: use a local variable in offline_remove_server

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/samba/common: py3 compat raw_input
Douglas Bagnall [Wed, 10 Oct 2018 23:52:09 +0000 (12:52 +1300)]
python/samba/common: py3 compat raw_input

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agosamba-tool ldapcmp: use ValueError, not obsolete StandardError
Douglas Bagnall [Wed, 10 Oct 2018 23:40:09 +0000 (12:40 +1300)]
samba-tool ldapcmp: use ValueError, not obsolete StandardError

The error is in the value, and StandardError is not in Python 3

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython tests: always use Python's unicodedata
Douglas Bagnall [Wed, 24 Oct 2018 02:56:20 +0000 (15:56 +1300)]
python tests: always use Python's unicodedata

We had our own special version with very few entries, but only
used it in one place.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopytest/dcerpc.integer: force py2 long int without incompatible syntax
Douglas Bagnall [Thu, 11 Oct 2018 05:31:09 +0000 (18:31 +1300)]
pytest/dcerpc.integer: force py2 long int without incompatible syntax

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/selftest/tests: don't use import *
Douglas Bagnall [Thu, 11 Oct 2018 03:52:28 +0000 (16:52 +1300)]
s4/selftest/tests: don't use import *

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos3/selftest/tests: don't use import *
Douglas Bagnall [Thu, 11 Oct 2018 03:51:23 +0000 (16:51 +1300)]
s3/selftest/tests: don't use import *

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agoselftest/tests.py: avoid import *
Douglas Bagnall [Thu, 11 Oct 2018 03:05:23 +0000 (16:05 +1300)]
selftest/tests.py: avoid import *

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/common: avoid import *
Douglas Bagnall [Thu, 11 Oct 2018 00:40:59 +0000 (13:40 +1300)]
python/tests/common: avoid import *

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agoselftest/perftests: avoid import *
Douglas Bagnall [Thu, 11 Oct 2018 03:05:11 +0000 (16:05 +1300)]
selftest/perftests: avoid import *

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/kcc_*: avoid * imports
Douglas Bagnall [Thu, 11 Oct 2018 01:51:55 +0000 (14:51 +1300)]
python/tests/kcc_*: avoid * imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/kcc.graph: avoid import *
Douglas Bagnall [Thu, 11 Oct 2018 01:44:02 +0000 (14:44 +1300)]
python/tests/kcc.graph: avoid import *

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/scripting/pfm_verify: remove duplicate import
Douglas Bagnall [Thu, 11 Oct 2018 05:33:23 +0000 (18:33 +1300)]
s4/scripting/pfm_verify: remove duplicate import

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agosamba-tool: samba.getopt is not used here
Douglas Bagnall [Wed, 10 Oct 2018 23:34:53 +0000 (12:34 +1300)]
samba-tool: samba.getopt is not used here

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agoauth/cred/tests/bind: remove unused import
Douglas Bagnall [Thu, 11 Oct 2018 05:25:53 +0000 (18:25 +1300)]
auth/cred/tests/bind: remove unused import

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/dsdb/pytest/: unused imports
Douglas Bagnall [Thu, 11 Oct 2018 04:24:22 +0000 (17:24 +1300)]
s4/dsdb/pytest/: unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/dsdb/pytest/dsdb_schema_info: do not double import
Douglas Bagnall [Thu, 11 Oct 2018 04:07:22 +0000 (17:07 +1300)]
s4/dsdb/pytest/dsdb_schema_info: do not double import

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agos4/dsdb/pytest/dirsync: do not double import
Douglas Bagnall [Thu, 11 Oct 2018 04:07:05 +0000 (17:07 +1300)]
s4/dsdb/pytest/dirsync: do not double import

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopy/tests: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 03:50:49 +0000 (16:50 +1300)]
py/tests: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agotests/blackbox/py: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 03:50:17 +0000 (16:50 +1300)]
tests/blackbox/py: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agotdb/test/_tdbtext: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 03:49:47 +0000 (16:49 +1300)]
tdb/test/_tdbtext: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agotalloc/test/pytalloc: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 03:49:05 +0000 (16:49 +1300)]
talloc/test/pytalloc: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agoldb/tests/_ldb_text: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 03:47:11 +0000 (16:47 +1300)]
ldb/tests/_ldb_text: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agoldb-samba/tests/match-rules: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 03:46:44 +0000 (16:46 +1300)]
ldb-samba/tests/match-rules: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agowintest/test-s3: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 03:05:57 +0000 (16:05 +1300)]
wintest/test-s3: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agoscript/generate_param.py: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 03:04:00 +0000 (16:04 +1300)]
script/generate_param.py: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 01:33:49 +0000 (14:33 +1300)]
python/tests: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/samdb: avoid useless local variable
Douglas Bagnall [Thu, 11 Oct 2018 01:00:30 +0000 (14:00 +1300)]
python/tests/samdb: avoid useless local variable

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/*: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 00:58:50 +0000 (13:58 +1300)]
python/tests/*: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/netbios: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 00:50:43 +0000 (13:50 +1300)]
python/tests/netbios: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/getdcname: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 00:45:54 +0000 (13:45 +1300)]
python/tests/getdcname: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/dsdb_schema_attr: remove unused/duplicate imports
Douglas Bagnall [Thu, 11 Oct 2018 00:44:45 +0000 (13:44 +1300)]
python/tests/dsdb_schema_attr: remove unused/duplicate imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/tests/dns*: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 00:42:10 +0000 (13:42 +1300)]
python/tests/dns*: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/provision: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 00:39:06 +0000 (13:39 +1300)]
python/provision: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/gp_parse/gp_pol: remove unused import
Douglas Bagnall [Thu, 11 Oct 2018 00:23:35 +0000 (13:23 +1300)]
python/gp_parse/gp_pol: remove unused import

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/schema: remove unused import
Douglas Bagnall [Thu, 11 Oct 2018 00:10:33 +0000 (13:10 +1300)]
python/schema: remove unused import

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/ntacls: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 00:06:40 +0000 (13:06 +1300)]
python/ntacls: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/gp_ext_loader: remove unused imports
Douglas Bagnall [Thu, 11 Oct 2018 00:05:32 +0000 (13:05 +1300)]
python/gp_ext_loader: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/forest_update: remove unused imports
Douglas Bagnall [Wed, 10 Oct 2018 23:57:15 +0000 (12:57 +1300)]
python/forest_update: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agopython/domain_update: remove unused imports
Douglas Bagnall [Wed, 10 Oct 2018 23:55:41 +0000 (12:55 +1300)]
python/domain_update: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agosamba-tool domain: remove unused imports
Douglas Bagnall [Wed, 10 Oct 2018 23:45:54 +0000 (12:45 +1300)]
samba-tool domain: remove unused imports

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agosamba-tool user: remove unused import
Douglas Bagnall [Wed, 10 Oct 2018 23:41:28 +0000 (12:41 +1300)]
samba-tool user: remove unused import

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
9 months agosamba-tool ldapcmp: remove unused import
Douglas Bagnall [Wed, 10 Oct 2018 23:38:58 +0000 (12:38 +1300)]
samba-tool ldapcmp: remove unused import

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>