bbaumbach/samba-autobuild/.git
5 years agoPEP8: ignore rules and exclude files
Joe Guo [Mon, 27 Aug 2018 04:48:59 +0000 (16:48 +1200)]
PEP8: ignore rules and exclude files

Will fix other ones and come back to these later.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowafsamba: Support clang as C compiler
Andreas Schneider [Wed, 5 Sep 2018 09:05:25 +0000 (11:05 +0200)]
wafsamba: Support clang as C compiler

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Sep  6 12:06:05 CEST 2018 on sn-devel-144

5 years agoctdb-tests: Check result of write() in ARP and TCP tests
Martin Schwenke [Wed, 5 Sep 2018 02:42:07 +0000 (12:42 +1000)]
ctdb-tests: Check result of write() in ARP and TCP tests

CTDB -O3 --picky-developer build is failing.  Not sure how this
slipped through.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Thu Sep  6 08:33:59 CEST 2018 on sn-devel-144

5 years agos4/selftest: enable samba4.schemaInfo.python for py3
Noel Power [Thu, 10 May 2018 12:16:28 +0000 (13:16 +0100)]
s4/selftest: enable samba4.schemaInfo.python for py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Sep  6 02:27:51 CEST 2018 on sn-devel-144

5 years agos4/selftest: Enable samba.tests.blackbox.smbcontrol for py3
Noel Power [Thu, 10 May 2018 11:51:19 +0000 (12:51 +0100)]
s4/selftest: Enable samba.tests.blackbox.smbcontrol for py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: enable samba.tests.blackbox.traffic_summary for py3
Noel Power [Thu, 10 May 2018 11:39:36 +0000 (12:39 +0100)]
s4/selftest: enable samba.tests.blackbox.traffic_summary for py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: Enable samba.tests.blackbox.traffic_learner for py3
Noel Power [Thu, 10 May 2018 11:36:32 +0000 (12:36 +0100)]
s4/selftest: Enable samba.tests.blackbox.traffic_learner for py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agopython/samba/tests: Change native string to binary for py2/py3 compat
Noel Power [Thu, 10 May 2018 11:35:58 +0000 (12:35 +0100)]
python/samba/tests: Change native string to binary for py2/py3 compat

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: samba.tests.blackbox.traffic_replay enabled for py3
Noel Power [Thu, 10 May 2018 11:23:08 +0000 (12:23 +0100)]
s4/selftest: samba.tests.blackbox.traffic_replay enabled for py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: samba.tests.emulate.traffic_packet enable for py3
Noel Power [Thu, 10 May 2018 10:58:35 +0000 (11:58 +0100)]
s4/selftest: samba.tests.emulate.traffic_packet enable for py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: enable samba.tests.emulate.traffic for py3
Noel Power [Wed, 9 May 2018 19:09:10 +0000 (20:09 +0100)]
s4/selftest: enable samba.tests.emulate.traffic for py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agopython/samba/emulate: PY3 port of samba.tests.emulate.traffic_packet
Noel Power [Thu, 10 May 2018 10:57:59 +0000 (11:57 +0100)]
python/samba/emulate: PY3 port of samba.tests.emulate.traffic_packet

Fixes
+ None cannot be used with '<' or '>' operators
+ ord expects 'str'
+ unicode doesn't exist in py3
+ bytes class does not have encode method

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agopython/samba/tests: fix traffic for py2/py3 compatability
Noel Power [Wed, 9 May 2018 19:05:36 +0000 (20:05 +0100)]
python/samba/tests: fix traffic for py2/py3 compatability

load/save operations return randomly sorted dictionaries in python3
these changes make sure the already sorted expected results are
compared with sorted actual values.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: enable samba.tests.py_credentials for py3
Noel Power [Wed, 9 May 2018 15:11:49 +0000 (16:11 +0100)]
s4/selftest: enable samba.tests.py_credentials for py3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agopython/samba/tests: port samba.tests.py_credentials for py2/py3 compat
Noel Power [Wed, 8 Aug 2018 11:51:20 +0000 (12:51 +0100)]
python/samba/tests: port samba.tests.py_credentials for py2/py3 compat

+ ord takes 'str' param
+ unicode doesn't exist in py3
+ py3 bytes class doesn't have encode method, try to ensure py2
  code runs unchanged while adapting code (by using get_string)

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoauth/credentials: py2/py3 credential key needs to return bytes
Noel Power [Wed, 9 May 2018 15:09:00 +0000 (16:09 +0100)]
auth/credentials: py2/py3 credential key needs to return bytes

new_client_authenticator returns a dictionary. The key
'credential' needs to return bytes in Python3, without this
change the the code will attempt to convert the binary data to
a string (resulting sometimes in decode errors).

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoselftest/knownfail.d: Add PY3 rule for samba.tests.py_credentials
Noel Power [Mon, 3 Sep 2018 14:21:07 +0000 (15:21 +0100)]
selftest/knownfail.d: Add PY3 rule for samba.tests.py_credentials

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: enable samba.tests.encrypted_secrets for python3
Noel Power [Wed, 9 May 2018 11:11:48 +0000 (12:11 +0100)]
s4/selftest: enable samba.tests.encrypted_secrets for python3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agopython/samba/tests: PY3 port of samba.tests.encrypted_secrets
Noel Power [Wed, 9 May 2018 11:07:20 +0000 (12:07 +0100)]
python/samba/tests: PY3 port of samba.tests.encrypted_secrets

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoselftest/knownfail.d: Add PY3 rule for samba.tests.encrypted_secrets
Noel Power [Mon, 3 Sep 2018 13:22:17 +0000 (14:22 +0100)]
selftest/knownfail.d: Add PY3 rule for samba.tests.encrypted_secrets

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: enable samba.tests.password_hash_ldap for python3
Noel Power [Wed, 9 May 2018 10:37:42 +0000 (11:37 +0100)]
s4/selftest: enable samba.tests.password_hash_ldap for python3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: enable samba.tests.password_hash_fl2008 for python3
Noel Power [Wed, 9 May 2018 10:27:40 +0000 (11:27 +0100)]
s4/selftest: enable samba.tests.password_hash_fl2008 for python3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agopython/samba/tests: py3 port for samba.test.password_hash_ldap
Noel Power [Wed, 9 May 2018 10:37:16 +0000 (11:37 +0100)]
python/samba/tests: py3 port for samba.test.password_hash_ldap

user samba.compat.text_type instead of unicode

in py2 text_type is an alias for unicode
in py3 text_type is an alias for str (which does nothing if
the input is already str)

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: enable samba.tests.password_hash_gpgme for python3
Noel Power [Wed, 9 May 2018 10:26:02 +0000 (11:26 +0100)]
s4/selftest: enable samba.tests.password_hash_gpgme for python3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agopython/samba/tests: make password_hash.py py2/py3 compatible
Noel Power [Wed, 9 May 2018 10:24:48 +0000 (11:24 +0100)]
python/samba/tests: make password_hash.py py2/py3 compatible

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agos4/selftest: enable tdb.python for python3
Noel Power [Wed, 9 May 2018 09:20:35 +0000 (10:20 +0100)]
s4/selftest: enable tdb.python for python3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoselftest: Run libsmbclient tests with NT1 and SMB3
Andreas Schneider [Mon, 3 Sep 2018 14:55:02 +0000 (16:55 +0200)]
selftest: Run libsmbclient tests with NT1 and SMB3

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Sep  5 21:56:11 CEST 2018 on sn-devel-144

5 years agos4:torture: Set credentials for libsmbclient correctly
Andreas Schneider [Mon, 3 Sep 2018 14:36:54 +0000 (16:36 +0200)]
s4:torture: Set credentials for libsmbclient correctly

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
5 years agos3:libsmbclient: Add function to set protocol levels
Andreas Schneider [Tue, 4 Sep 2018 13:48:03 +0000 (15:48 +0200)]
s3:libsmbclient: Add function to set protocol levels

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
5 years agos3:libsmbclient: Do not call cli_RNetShareEnum if SMB1 is disabled
Andreas Schneider [Tue, 4 Sep 2018 14:08:58 +0000 (16:08 +0200)]
s3:libsmbclient: Do not call cli_RNetShareEnum if SMB1 is disabled

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
5 years agos3:smbclient: Do not call cli_RNetShareEnum if SMB1 is disabled
Andreas Schneider [Tue, 4 Sep 2018 09:11:49 +0000 (11:11 +0200)]
s3:smbclient: Do not call cli_RNetShareEnum if SMB1 is disabled

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
5 years agosmbclient: Fix errors printed if we can connect with SMB1
Andreas Schneider [Mon, 3 Sep 2018 10:11:39 +0000 (12:11 +0200)]
smbclient: Fix errors printed if we can connect with SMB1

smbclient -L //server

before:

Reconnecting with SMB1 for workgroup listing.
Connection to earth.milkyway.site failed (Error NT_STATUS_RESOURCE_NAME_NOT_FOUND)
Failed to connect with SMB1 -- no workgroup available

after:

Reconnecting with SMB1 for workgroup listing.
Unable to connect with SMB1 -- no workgroup available

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
5 years agokdc: Improve code clarity with extra brackets
Andrew Bartlett [Mon, 3 Sep 2018 00:50:39 +0000 (12:50 +1200)]
kdc: Improve code clarity with extra brackets

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Sep  5 16:17:59 CEST 2018 on sn-devel-144

5 years agoheimdal: Change KDC to respect HDB server name type if f.canonicalize is set
Andrew Bartlett [Mon, 3 Sep 2018 00:49:40 +0000 (12:49 +1200)]
heimdal: Change KDC to respect HDB server name type if f.canonicalize is set

This changes behaviour flagged as being for Java 1.6.  My hope is that this does not
set f.canonicalize

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agotorture krb5.kdc.canon: Correct principal being checked in TEST_AS_REQ_SELF stage
Andrew Bartlett [Sun, 2 Sep 2018 22:41:10 +0000 (10:41 +1200)]
torture krb5.kdc.canon: Correct principal being checked in TEST_AS_REQ_SELF stage

We have already checked the client principal.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agotorture: Confirm that this element of the krb5.kdc test does not pass against Windows
Andrew Bartlett [Mon, 27 Aug 2018 03:01:41 +0000 (15:01 +1200)]
torture: Confirm that this element of the krb5.kdc test does not pass against Windows

This should be fixed, but in the meantime add clue to avoid regressions on
bug 11539.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoselftest/samba4.blackbox.export.keytab: Update to use a principal with SPN as UPN
Andrew Bartlett [Mon, 3 Sep 2018 08:26:17 +0000 (20:26 +1200)]
selftest/samba4.blackbox.export.keytab: Update to use a principal with SPN as UPN

The ability the kinit with an SPN (not also being a UPN) has gone away as
windows doesn't offer this functionality.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoselftest: Add new test to run krb5.kdc.canon against a user with an SPN for a UPN
Andrew Bartlett [Mon, 27 Aug 2018 03:00:12 +0000 (15:00 +1200)]
selftest: Add new test to run krb5.kdc.canon against a user with an SPN for a UPN

The failures in this test compared with Windows Server 1709 are added to
knownfail.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoRevert "s4/heimdal: allow SPNs in AS-REQ"
Andrew Bartlett [Thu, 30 Nov 2017 03:30:49 +0000 (16:30 +1300)]
Revert "s4/heimdal: allow SPNs in AS-REQ"

This reverts commit 20dc68050df7b1b0c9d06f8251183a0a6283fcaf.

Tests (the krb5.kdc testsuite) show this behaviour is incorrect.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agoselftest/samba4.blackbox.export.keytab: Remove stray exit 0 and so run cleanup
Andrew Bartlett [Mon, 3 Sep 2018 04:38:20 +0000 (16:38 +1200)]
selftest/samba4.blackbox.export.keytab: Remove stray exit 0 and so run cleanup

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agotorture: Add tests to prove that kinit to an SPN is not allowed (unless it is also...
Andrew Bartlett [Thu, 16 Nov 2017 01:01:56 +0000 (14:01 +1300)]
torture: Add tests to prove that kinit to an SPN is not allowed (unless it is also a UPN)

The krb5.kdc.canon testsuite has been updated to pass against Windows
Server 1709 in four modes:

* A normal user
* A user with a UPN
* A user with an SPN (machine account)
* A user with an SPN as the UPN

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
5 years agothird_party: Import exact files from waf-2.0.8/waflib
Andrew Bartlett [Tue, 4 Sep 2018 21:58:21 +0000 (09:58 +1200)]
third_party: Import exact files from waf-2.0.8/waflib

wget https://waf.io/waf-2.0.8.tar.bz2
tar -xf waf-2.0.8.tar.bz2
rsync -a waf-2.0.8/waflib/ third_party/waf/waflib/

The previous import was damaged by auto-strip/correct of whitespace
and had other small corrections.

Check with git show -w.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Sep  5 09:29:39 CEST 2018 on sn-devel-144

5 years agoscript/autobuild: Fix formatting in send_email
Alexander Bokovoy [Mon, 3 Sep 2018 10:20:31 +0000 (13:20 +0300)]
script/autobuild: Fix formatting in send_email

Commit cb40e2bbc8a34a1ec3584ab585c5bf44c037ef0e introduced a print
statement with a broken formatting. Reported by pylint.

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoscript/autobuild: re-use CACHE_SUFFIX from waflib
Alexander Bokovoy [Mon, 3 Sep 2018 10:07:23 +0000 (13:07 +0300)]
script/autobuild: re-use CACHE_SUFFIX from waflib

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded name
Alexander Bokovoy [Mon, 3 Sep 2018 10:04:58 +0000 (13:04 +0300)]
buildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded name

waflib.Build provides CACHE_SUFFIX constant to append to the target
name. We have a reference to samba-specific cache suffix (.cache.py)
while original WAF uses _cache.py as a cache suffix since 2011 (see
commit 44a967e326cc2e670a31b3712e4763b72d65e81b in WAF project code).

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agolib/mscat: fix logging in wscript
Alexander Bokovoy [Mon, 3 Sep 2018 09:51:59 +0000 (12:51 +0300)]
lib/mscat: fix logging in wscript

5 years agolib/audit_logging: update to waf 2.0
Alexander Bokovoy [Thu, 5 Jul 2018 11:26:57 +0000 (14:26 +0300)]
lib/audit_logging: update to waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: remove ENFORCE_GROUP_ORDERING
Alexander Bokovoy [Wed, 4 Jul 2018 08:47:42 +0000 (11:47 +0300)]
buildtools/wafsamba: remove ENFORCE_GROUP_ORDERING

ENFORCE_GROUP_ORDERING is not needed with waf 2.0 anymore

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoctdb/wscript: rework how version number is retrieved
Alexander Bokovoy [Wed, 4 Jul 2018 08:05:10 +0000 (11:05 +0300)]
ctdb/wscript: rework how version number is retrieved

Using default context functions before waf initialization occured
is prone to error. Postpone calling samba_version.* code until we
got default context initialized.

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoselftest/tests.py: update to support waf 2.0
Alexander Bokovoy [Tue, 3 Jul 2018 11:57:48 +0000 (14:57 +0300)]
selftest/tests.py: update to support waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowscript: port build_system_heimdal to waf 2.0
Alexander Bokovoy [Tue, 3 Jul 2018 10:07:44 +0000 (13:07 +0300)]
wscript: port build_system_heimdal to waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowscript: port build_system_mitkrb5 to waf 2.0
Alexander Bokovoy [Tue, 3 Jul 2018 10:07:09 +0000 (13:07 +0300)]
wscript: port build_system_mitkrb5 to waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: port stale_files to waf 2.0
Alexander Bokovoy [Tue, 3 Jul 2018 10:06:40 +0000 (13:06 +0300)]
buildtools/wafsamba: port stale_files to waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: generate build options output with waf 2.0
Alexander Bokovoy [Tue, 3 Jul 2018 09:48:39 +0000 (12:48 +0300)]
buildtools/wafsamba: generate build options output with waf 2.0

With WAF 2.0 we get all defines in environment at the same level.
Fix build options source code generator to handle this.

I felt uneasy at filtering out some defines so instead the code
is mangling generic defines to be correct for C compiler by
replacing '-', '.', and '()' with an underscore ('_').

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoselftest/wscript: properly handle env.cwd which is a list, not a string
Alexander Bokovoy [Tue, 3 Jul 2018 08:18:05 +0000 (11:18 +0300)]
selftest/wscript: properly handle env.cwd which is a list, not a string

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowafsamba: install Python modules back to bin/python, not bin/python_modules
Alexander Bokovoy [Tue, 3 Jul 2018 08:09:12 +0000 (11:09 +0300)]
wafsamba: install Python modules back to bin/python, not bin/python_modules

Partially revert 80fce353e740c793619005ac102ab07fb5e7d280 which started
installing generated Python modules into python_modules directory back
in 2013. This, unfortunately, does not work anymore as Python gets quite
confused with our setup even when both bin/python and bin/python_modules
directories are part of sys.path.

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: use cflags instead of ccflags for waf 2.0
Alexander Bokovoy [Wed, 27 Jun 2018 13:44:12 +0000 (16:44 +0300)]
buildtools/wafsamba: use cflags instead of ccflags for waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: use context instead of options for cross-compile checks for...
Alexander Bokovoy [Wed, 27 Jun 2018 13:42:29 +0000 (16:42 +0300)]
buildtools/wafsamba: use context instead of options for cross-compile checks for waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0
Alexander Bokovoy [Wed, 27 Jun 2018 13:34:53 +0000 (16:34 +0300)]
buildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: use top and out for waf 2.0
Alexander Bokovoy [Wed, 27 Jun 2018 12:03:08 +0000 (15:03 +0300)]
buildtools/wafsamba: use top and out for waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agocdtb/wscript: use top and out for waf 2.0
Alexander Bokovoy [Wed, 27 Jun 2018 11:56:32 +0000 (14:56 +0300)]
cdtb/wscript: use top and out for waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowscript: adopt to waf 2.0
Alexander Bokovoy [Wed, 27 Jun 2018 11:54:09 +0000 (14:54 +0300)]
wscript: adopt to waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: use top for waf 2.0
Alexander Bokovoy [Wed, 27 Jun 2018 11:33:36 +0000 (14:33 +0300)]
buildtools/wafsamba: use top for waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: change SAMBA_BUILD_ENV to use bldnode.abspath()
Alexander Bokovoy [Wed, 27 Jun 2018 10:45:56 +0000 (13:45 +0300)]
buildtools/wafsamba: change SAMBA_BUILD_ENV to use bldnode.abspath()

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoselftest/wscript: handle lists in environmental variables in waf
Alexander Bokovoy [Wed, 27 Jun 2018 09:26:09 +0000 (12:26 +0300)]
selftest/wscript: handle lists in environmental variables in waf

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowaf heimdal: use absolute path to compile_et
Alexander Bokovoy [Tue, 26 Jun 2018 21:25:03 +0000 (00:25 +0300)]
waf heimdal: use absolute path to compile_et

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowafsamba: use correct context for APPNAME
Alexander Bokovoy [Tue, 26 Jun 2018 21:24:31 +0000 (00:24 +0300)]
wafsamba: use correct context for APPNAME

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: compile asn1 files by adding missing code from compat15
Thomas Nagy [Tue, 26 Jun 2018 19:16:26 +0000 (21:16 +0200)]
buildtools/wafsamba: compile asn1 files by adding missing code from compat15

Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowscript: adopt to waf-2.0
Alexander Bokovoy [Fri, 15 Jun 2018 14:03:28 +0000 (17:03 +0300)]
wscript: adopt to waf-2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoctdb/wscript: adopt to waf-2.0
Alexander Bokovoy [Fri, 15 Jun 2018 14:01:59 +0000 (17:01 +0300)]
ctdb/wscript: adopt to waf-2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba/samba_abi: always_run helper was deprecated in waf 2.0
Alexander Bokovoy [Fri, 15 Jun 2018 13:32:33 +0000 (16:32 +0300)]
buildtools/wafsamba/samba_abi: always_run helper was deprecated in waf 2.0

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agosource3/libsmb/wscript: remove unneeded import
Alexander Bokovoy [Fri, 15 Jun 2018 13:21:06 +0000 (16:21 +0300)]
source3/libsmb/wscript: remove unneeded import

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agonsswitch/libwbclient/wscript: import from waflib
Alexander Bokovoy [Fri, 15 Jun 2018 13:20:34 +0000 (16:20 +0300)]
nsswitch/libwbclient/wscript: import from waflib

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoauth/wscript: import from waflib
Alexander Bokovoy [Fri, 15 Jun 2018 13:18:34 +0000 (16:18 +0300)]
auth/wscript: import from waflib

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: add install_dir to build context
Alexander Bokovoy [Wed, 27 Jun 2018 13:06:44 +0000 (16:06 +0300)]
buildtools/wafsamba: add install_dir to build context

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: reduce imports
Alexander Bokovoy [Fri, 15 Jun 2018 13:17:14 +0000 (16:17 +0300)]
buildtools/wafsamba: reduce imports

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agobuildtools/wafsamba: adopt to waf 2.0.8
Alexander Bokovoy [Fri, 15 Jun 2018 10:32:00 +0000 (13:32 +0300)]
buildtools/wafsamba: adopt to waf 2.0.8

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/waf: upgrade to waf 2.0.8
Alexander Bokovoy [Fri, 15 Jun 2018 10:29:45 +0000 (13:29 +0300)]
third_party/waf: upgrade to waf 2.0.8

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoauth/wscript: fix options use
Alexander Bokovoy [Tue, 5 Jun 2018 16:24:55 +0000 (19:24 +0300)]
auth/wscript: fix options use

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agoheimdal wscript changes
Alexander Bokovoy [Fri, 20 Apr 2018 11:01:51 +0000 (14:01 +0300)]
heimdal wscript changes

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowscript_configure_system_mitkrb5: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
wscript_configure_system_mitkrb5: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowscript_build_embedded_heimdal: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
wscript_build_embedded_heimdal: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowscript_build: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
wscript_build: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agowscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
third_party/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/uid_wrapper/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
third_party/uid_wrapper/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/socket_wrapper/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
third_party/socket_wrapper/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/resolv_wrapper/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
third_party/resolv_wrapper/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/popt/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:33 +0000 (16:34 +0200)]
third_party/popt/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/pam_wrapper/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
third_party/pam_wrapper/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/nss_wrapper/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
third_party/nss_wrapper/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/cmocka/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
third_party/cmocka/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agothird_party/aesni-intel/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
third_party/aesni-intel/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agotestsuite/headers/wscript_build: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
testsuite/headers/wscript_build: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agosource4/lib/tls/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
source4/lib/tls/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agosource4/heimdal_build/wscript_configure: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
source4/heimdal_build/wscript_configure: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agosource4/heimdal_build/wscript_build: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
source4/heimdal_build/wscript_build: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agosource4/dsdb/samdb/ldb_modules/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
source4/dsdb/samdb/ldb_modules/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agosource3/wscript_configure_system_ncurses: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
source3/wscript_configure_system_ncurses: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
5 years agosource3/wscript: update to handle waf 2.0.4
Alexander Bokovoy [Fri, 2 Feb 2018 14:34:32 +0000 (16:34 +0200)]
source3/wscript: update to handle waf 2.0.4

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>