[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8de348e third_party: Import exact files from waf-2.0.8/waflib via 8f022a0 script/autobuild: Fix formatting in send_email via 67ed1ea script/autobuild: re-use CACHE_SUFFIX from waflib via 72c3ff9 buildtools/wafsamba: use CACHE_SUFFIX instead of a hard-coded name via 6fc9f1a lib/mscat: fix logging in wscript via 4c7c10b lib/audit_logging: update to waf 2.0 via f495f64 buildtools/wafsamba: remove ENFORCE_GROUP_ORDERING via 0a9d98b ctdb/wscript: rework how version number is retrieved via fdd89fe selftest/tests.py: update to support waf 2.0 via 72a9e6d wscript: port build_system_heimdal to waf 2.0 via 1efe689 wscript: port build_system_mitkrb5 to waf 2.0 via 7944ed6 buildtools/wafsamba: port stale_files to waf 2.0 via 2a3fcdf buildtools/wafsamba: generate build options output with waf 2.0 via 75d5bcb selftest/wscript: properly handle env.cwd which is a list, not a string via 31f8945 wafsamba: install Python modules back to bin/python, not bin/python_modules via 77f3a13 buildtools/wafsamba: use cflags instead of ccflags for waf 2.0 via 1d25ae5 buildtools/wafsamba: use context instead of options for cross-compile checks for waf 2.0 via aebcd69 buildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0 via fb43723 buildtools/wafsamba: use top and out for waf 2.0 via 5c3d31e cdtb/wscript: use top and out for waf 2.0 via 699977a wscript: adopt to waf 2.0 via 0fdba4b buildtools/wafsamba: use top for waf 2.0 via cdda0d9 buildtools/wafsamba: change SAMBA_BUILD_ENV to use bldnode.abspath() via 35ebfd3 selftest/wscript: handle lists in environmental variables in waf via 2a63619 waf heimdal: use absolute path to compile_et via 1fdcbd0 wafsamba: use correct context for APPNAME via 850ceec buildtools/wafsamba: compile asn1 files by adding missing code from compat15 via 2e401d2 wscript: adopt to waf-2.0 via 175be93 ctdb/wscript: adopt to waf-2.0 via 7aaa1e6 buildtools/wafsamba/samba_abi: always_run helper was deprecated in waf 2.0 via 9f2f5b4 source3/libsmb/wscript: remove unneeded import via d00ba40 nsswitch/libwbclient/wscript: import from waflib via 944fce2 auth/wscript: import from waflib via 3fc4786 buildtools/wafsamba: add install_dir to build context via 69c655f buildtools/wafsamba: reduce imports via 7eab91a buildtools/wafsamba: adopt to waf 2.0.8 via 3b7dfc5 third_party/waf: upgrade to waf 2.0.8 via 79c4ba2 auth/wscript: fix options use via c5ab9ea heimdal wscript changes via ef4b2d4 wscript_configure_system_mitkrb5: update to handle waf 2.0.4 via e58ca30 wscript_build_embedded_heimdal: update to handle waf 2.0.4 via 1dc80eb wscript_build: update to handle waf 2.0.4 via c73b779 wscript: update to handle waf 2.0.4 via 0119a87 third_party/wscript: update to handle waf 2.0.4 via f14b8cb third_party/uid_wrapper/wscript: update to handle waf 2.0.4 via 051e7e7 third_party/socket_wrapper/wscript: update to handle waf 2.0.4 via 4c44153 third_party/resolv_wrapper/wscript: update to handle waf 2.0.4 via 7e2deed third_party/popt/wscript: update to handle waf 2.0.4 via 2847a38 third_party/pam_wrapper/wscript: update to handle waf 2.0.4 via 2b21e67 third_party/nss_wrapper/wscript: update to handle waf 2.0.4 via 3e71f06 third_party/cmocka/wscript: update to handle waf 2.0.4 via ba03d12 third_party/aesni-intel/wscript: update to handle waf 2.0.4 via ca5008a testsuite/headers/wscript_build: update to handle waf 2.0.4 via 0c423a3 source4/lib/tls/wscript: update to handle waf 2.0.4 via c797e92 source4/heimdal_build/wscript_configure: update to handle waf 2.0.4 via 055aae9 source4/heimdal_build/wscript_build: update to handle waf 2.0.4 via 029ac7d source4/dsdb/samdb/ldb_modules/wscript: update to handle waf 2.0.4 via 8b5ad02 source3/wscript_configure_system_ncurses: update to handle waf 2.0.4 via 91e099d source3/wscript: update to handle waf 2.0.4 via c898f18 source3/build/charset.py: update to handle waf 2.0.4 via 0de67cf selftest/wscript: update to handle waf 2.0.4 via fa1ca71 python/wscript: update to handle waf 2.0.4 via 7f6ce8f pidl/wscript: update to handle waf 2.0.4 via e1e5b57 packaging/wscript: update to handle waf 2.0.4 via 8a74116 nsswitch/wscript_build: update to handle waf 2.0.4 via e676183 lib/util/wscript_configure: update to handle waf 2.0.4 via 5f57714 lib/util/wscript: update to handle waf 2.0.4 via d4cef3b lib/tevent/wscript: update to handle waf 2.0.4 via 15288c3 lib/tdb/wscript: update to handle waf 2.0
Re: [SCM] Samba Shared Repository - branch master updated
On ke, 05 syys 2018, Andrew Bartlett wrote: > The branch, master has been updated >via 8de348e third_party: Import exact files from waf-2.0.8/waflib >via 8f022a0 script/autobuild: Fix formatting in send_email >via 67ed1ea script/autobuild: re-use CACHE_SUFFIX from waflib >via 72c3ff9 buildtools/wafsamba: use CACHE_SUFFIX instead of a > hard-coded name >via 6fc9f1a lib/mscat: fix logging in wscript >via 4c7c10b lib/audit_logging: update to waf 2.0 >via f495f64 buildtools/wafsamba: remove ENFORCE_GROUP_ORDERING >via 0a9d98b ctdb/wscript: rework how version number is retrieved >via fdd89fe selftest/tests.py: update to support waf 2.0 >via 72a9e6d wscript: port build_system_heimdal to waf 2.0 >via 1efe689 wscript: port build_system_mitkrb5 to waf 2.0 >via 7944ed6 buildtools/wafsamba: port stale_files to waf 2.0 >via 2a3fcdf buildtools/wafsamba: generate build options output with > waf 2.0 >via 75d5bcb selftest/wscript: properly handle env.cwd which is a > list, not a string >via 31f8945 wafsamba: install Python modules back to bin/python, not > bin/python_modules >via 77f3a13 buildtools/wafsamba: use cflags instead of ccflags for > waf 2.0 >via 1d25ae5 buildtools/wafsamba: use context instead of options for > cross-compile checks for waf 2.0 >via aebcd69 buildtools/wafsamba: crosscompile should use > Utils.subprocess in waf 2.0 >via fb43723 buildtools/wafsamba: use top and out for waf 2.0 >via 5c3d31e cdtb/wscript: use top and out for waf 2.0 >via 699977a wscript: adopt to waf 2.0 >via 0fdba4b buildtools/wafsamba: use top for waf 2.0 >via cdda0d9 buildtools/wafsamba: change SAMBA_BUILD_ENV to use > bldnode.abspath() >via 35ebfd3 selftest/wscript: handle lists in environmental variables > in waf >via 2a63619 waf heimdal: use absolute path to compile_et >via 1fdcbd0 wafsamba: use correct context for APPNAME >via 850ceec buildtools/wafsamba: compile asn1 files by adding missing > code from compat15 >via 2e401d2 wscript: adopt to waf-2.0 >via 175be93 ctdb/wscript: adopt to waf-2.0 >via 7aaa1e6 buildtools/wafsamba/samba_abi: always_run helper was > deprecated in waf 2.0 >via 9f2f5b4 source3/libsmb/wscript: remove unneeded import >via d00ba40 nsswitch/libwbclient/wscript: import from waflib >via 944fce2 auth/wscript: import from waflib >via 3fc4786 buildtools/wafsamba: add install_dir to build context >via 69c655f buildtools/wafsamba: reduce imports >via 7eab91a buildtools/wafsamba: adopt to waf 2.0.8 >via 3b7dfc5 third_party/waf: upgrade to waf 2.0.8 >via 79c4ba2 auth/wscript: fix options use >via c5ab9ea heimdal wscript changes >via ef4b2d4 wscript_configure_system_mitkrb5: update to handle waf > 2.0.4 >via e58ca30 wscript_build_embedded_heimdal: update to handle waf 2.0.4 >via 1dc80eb wscript_build: update to handle waf 2.0.4 >via c73b779 wscript: update to handle waf 2.0.4 >via 0119a87 third_party/wscript: update to handle waf 2.0.4 >via f14b8cb third_party/uid_wrapper/wscript: update to handle waf > 2.0.4 >via 051e7e7 third_party/socket_wrapper/wscript: update to handle waf > 2.0.4 >via 4c44153 third_party/resolv_wrapper/wscript: update to handle waf > 2.0.4 >via 7e2deed third_party/popt/wscript: update to handle waf 2.0.4 >via 2847a38 third_party/pam_wrapper/wscript: update to handle waf > 2.0.4 >via 2b21e67 third_party/nss_wrapper/wscript: update to handle waf > 2.0.4 >via 3e71f06 third_party/cmocka/wscript: update to handle waf 2.0.4 >via ba03d12 third_party/aesni-intel/wscript: update to handle waf > 2.0.4 >via ca5008a testsuite/headers/wscript_build: update to handle waf > 2.0.4 >via 0c423a3 source4/lib/tls/wscript: update to handle waf 2.0.4 >via c797e92 source4/heimdal_build/wscript_configure: update to handle > waf 2.0.4 >via 055aae9 source4/heimdal_build/wscript_build: update to handle waf > 2.0.4 >via 029ac7d source4/dsdb/samdb/ldb_modules/wscript: update to handle > waf 2.0.4 >via 8b5ad02 source3/wscript_configure_system_ncurses: update to > handle waf 2.0.4 >via 91e099d source3/wscript: update to handle waf 2.0.4 >via c898f18 source3/build/charset.py: update to handle waf 2.0.4 >via 0de67cf selftest/wscript: update to handle waf 2.0.4 >via fa1ca71 python/wscript: update to handle waf 2.0.4 >via 7f6ce8f pidl/wscript: update to handle waf 2.0.4 >via e1e5b57 packaging/wscript: update to handle waf 2.0.4 >via 8a74116 nsswitch/wscript_build: update to handle waf 2.0.4 >via e676183 lib/util/wscript_c
Re: [SCM] Samba Shared Repository - branch master updated
Hi Alexander, On Wed, Sep 5, 2018 at 6:41 PM, Alexander Bokovoy wrote: > On ke, 05 syys 2018, Andrew Bartlett wrote: >> The branch, master has been updated >>via 8de348e third_party: Import exact files from waf-2.0.8/waflib >>via 8f022a0 script/autobuild: Fix formatting in send_email >>via 67ed1ea script/autobuild: re-use CACHE_SUFFIX from waflib >>via 72c3ff9 buildtools/wafsamba: use CACHE_SUFFIX instead of a >> hard-coded name >>via 6fc9f1a lib/mscat: fix logging in wscript >>via 4c7c10b lib/audit_logging: update to waf 2.0 >>via f495f64 buildtools/wafsamba: remove ENFORCE_GROUP_ORDERING >>via 0a9d98b ctdb/wscript: rework how version number is retrieved >>via fdd89fe selftest/tests.py: update to support waf 2.0 >>via 72a9e6d wscript: port build_system_heimdal to waf 2.0 >>via 1efe689 wscript: port build_system_mitkrb5 to waf 2.0 >>via 7944ed6 buildtools/wafsamba: port stale_files to waf 2.0 >>via 2a3fcdf buildtools/wafsamba: generate build options output with >> waf 2.0 >>via 75d5bcb selftest/wscript: properly handle env.cwd which is a >> list, not a string >>via 31f8945 wafsamba: install Python modules back to bin/python, not >> bin/python_modules >>via 77f3a13 buildtools/wafsamba: use cflags instead of ccflags for >> waf 2.0 >>via 1d25ae5 buildtools/wafsamba: use context instead of options for >> cross-compile checks for waf 2.0 >>via aebcd69 buildtools/wafsamba: crosscompile should use >> Utils.subprocess in waf 2.0 >>via fb43723 buildtools/wafsamba: use top and out for waf 2.0 >>via 5c3d31e cdtb/wscript: use top and out for waf 2.0 >>via 699977a wscript: adopt to waf 2.0 >>via 0fdba4b buildtools/wafsamba: use top for waf 2.0 >>via cdda0d9 buildtools/wafsamba: change SAMBA_BUILD_ENV to use >> bldnode.abspath() >>via 35ebfd3 selftest/wscript: handle lists in environmental >> variables in waf >>via 2a63619 waf heimdal: use absolute path to compile_et >>via 1fdcbd0 wafsamba: use correct context for APPNAME >>via 850ceec buildtools/wafsamba: compile asn1 files by adding >> missing code from compat15 >>via 2e401d2 wscript: adopt to waf-2.0 >>via 175be93 ctdb/wscript: adopt to waf-2.0 >>via 7aaa1e6 buildtools/wafsamba/samba_abi: always_run helper was >> deprecated in waf 2.0 >>via 9f2f5b4 source3/libsmb/wscript: remove unneeded import >>via d00ba40 nsswitch/libwbclient/wscript: import from waflib >>via 944fce2 auth/wscript: import from waflib >>via 3fc4786 buildtools/wafsamba: add install_dir to build context >>via 69c655f buildtools/wafsamba: reduce imports >>via 7eab91a buildtools/wafsamba: adopt to waf 2.0.8 >>via 3b7dfc5 third_party/waf: upgrade to waf 2.0.8 >>via 79c4ba2 auth/wscript: fix options use >>via c5ab9ea heimdal wscript changes >>via ef4b2d4 wscript_configure_system_mitkrb5: update to handle waf >> 2.0.4 >>via e58ca30 wscript_build_embedded_heimdal: update to handle waf >> 2.0.4 >>via 1dc80eb wscript_build: update to handle waf 2.0.4 >>via c73b779 wscript: update to handle waf 2.0.4 >>via 0119a87 third_party/wscript: update to handle waf 2.0.4 >>via f14b8cb third_party/uid_wrapper/wscript: update to handle waf >> 2.0.4 >>via 051e7e7 third_party/socket_wrapper/wscript: update to handle waf >> 2.0.4 >>via 4c44153 third_party/resolv_wrapper/wscript: update to handle waf >> 2.0.4 >>via 7e2deed third_party/popt/wscript: update to handle waf 2.0.4 >>via 2847a38 third_party/pam_wrapper/wscript: update to handle waf >> 2.0.4 >>via 2b21e67 third_party/nss_wrapper/wscript: update to handle waf >> 2.0.4 >>via 3e71f06 third_party/cmocka/wscript: update to handle waf 2.0.4 >>via ba03d12 third_party/aesni-intel/wscript: update to handle waf >> 2.0.4 >>via ca5008a testsuite/headers/wscript_build: update to handle waf >> 2.0.4 >>via 0c423a3 source4/lib/tls/wscript: update to handle waf 2.0.4 >>via c797e92 source4/heimdal_build/wscript_configure: update to >> handle waf 2.0.4 >>via 055aae9 source4/heimdal_build/wscript_build: update to handle >> waf 2.0.4 >>via 029ac7d source4/dsdb/samdb/ldb_modules/wscript: update to handle >> waf 2.0.4 >>via 8b5ad02 source3/wscript_configure_system_ncurses: update to >> handle waf 2.0.4 >>via 91e099d source3/wscript: update to handle waf 2.0.4 >>via c898f18 source3/build/charset.py: update to handle waf 2.0.4 >>via 0de67cf selftest/wscript: update to handle waf 2.0.4 >>via fa1ca71 python/wscript: update to handle waf 2.0.4 >>via 7f6ce8f pidl/wscript: update to handle waf 2.0.4 >>via
Re: [SCM] Samba Shared Repository - branch master updated
On Wed, Sep 5, 2018 at 6:52 PM, Amitay Isaacs wrote:
> Hi Alexander,
>
> On Wed, Sep 5, 2018 at 6:41 PM, Alexander Bokovoy wrote:
>> On ke, 05 syys 2018, Andrew Bartlett wrote:
>>> The branch, master has been updated
>>>
>>> https://git.samba.org/?p=samba.git;a=shortlog;h=master
>> Thank you, Andrew, for the reviews and persistent push to complete this!
>>
>> We are using WAF 2.x now which should allow us to concentrate on
>> switching to Python 3 for the build process as well for all our
>> libraries and components.
>>
>> If you see any build issues related to the WAF, please report them.
>> Autobuild succeeded but we might still have pieces of Python code that
>> aren't excercised through the autobuild targets.
>
> Great job updating to the latest waf.
>
> Now fixing all the corner cases... ;-)
>
Here's another one This time on AIX using xlc...
$ ./configure --enable-developer
Setting top to :
/home/jenkins/workspace/samba-master/label/ppc64-aix7
Setting out to :
/home/jenkins/workspace/samba-master/label/ppc64-aix7/ctdb/bin
Checking for 'xlc' (C compiler) : Traceback (most recent call last):
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Scripting.py",
line 158, in waf_entry_point
run_commands()
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Scripting.py",
line 251, in run_commands
ctx = run_command(cmd_name)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Scripting.py",
line 235, in run_command
ctx.execute()
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Configure.py",
line 159, in execute
super(ConfigurationContext, self).execute()
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Context.py",
line 204, in execute
self.recurse([os.path.dirname(g_module.root_path)])
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Context.py",
line 286, in recurse
user_function(self)
File "/home/jenkins/workspace/samba-master/label/ppc64-aix7/ctdb/wscript",
line 118, in configure
conf.RECURSE('lib/replace')
File "./../buildtools/wafsamba/samba_utils.py", line 30, in fun
return f(*k, **kw)
File "./../buildtools/wafsamba/samba_utils.py", line 433, in RECURSE
return ctx.recurse(relpath)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Context.py",
line 286, in recurse
user_function(self)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Utils.py",
line 816, in wrap
ret = fun(*k)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/lib/replace/wscript",
line 30, in configure
conf.RECURSE('buildtools/wafsamba')
File "./../buildtools/wafsamba/samba_utils.py", line 30, in fun
return f(*k, **kw)
File "./../buildtools/wafsamba/samba_utils.py", line 433, in RECURSE
return ctx.recurse(relpath)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Context.py",
line 286, in recurse
user_function(self)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Utils.py",
line 816, in wrap
ret = fun(*k)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/buildtools/wafsamba/wscript",
line 234, in configure
conf.load('compiler_cc')
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Configure.py",
line 270, in load
func(self)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Tools/compiler_c.py",
line 79, in configure
conf.load(compiler)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Configure.py",
line 270, in load
func(self)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Tools/xlc.py",
line 59, in configure
conf.find_xlc()
File "./../buildtools/wafsamba/samba_utils.py", line 30, in fun
return f(*k, **kw)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Tools/xlc.py",
line 17, in find_xlc
conf.get_xlc_version(cc)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Configure.py",
line 316, in fun
return f(*k, **kw)
File
"/home/jenkins/workspace/samba-master/label/ppc64-aix7/third_party/waf/waflib/Tools/c_config.py",
line 1097, in get_xlc_version
cmd = cc + ['-qversion']
TypeError: unsupported operand type(s) for +: 'NoneType' and 'list'
I don't have time to dig deeper this week. Will spend some time next
week if this issue is not resolved by then.
Amitay.
Re: [SCM] Samba Shared Repository - branch master updated
On ke, 05 syys 2018, Amitay Isaacs wrote:
> > Thank you, Andrew, for the reviews and persistent push to complete this!
> >
> > We are using WAF 2.x now which should allow us to concentrate on
> > switching to Python 3 for the build process as well for all our
> > libraries and components.
> >
> > If you see any build issues related to the WAF, please report them.
> > Autobuild succeeded but we might still have pieces of Python code that
> > aren't excercised through the autobuild targets.
>
> Great job updating to the latest waf.
>
> Now fixing all the corner cases... ;-)
:)
>
> On freebsd-11, waf does not want to use clang and complains that it
> cannot find a C compiler.
Thanks, I'll do a FreeBSD v11 VM later this week if nobody else gets it
fixed earlier. The python exception you see is due to this one:
def CHECK_STANDARD_LIBPATH(conf):
# at least gcc and clang support this:
try:
cmd = conf.env.CC + ['-print-search-dirs']
out = Utils.cmd_output(cmd).split('\n')
except ValueError:
# option not supported by compiler - use a standard list of directories
dirlist = [ '/usr/lib', '/usr/lib64' ]
except:
raise Errors.WafError('Unexpected error running "%s"' % (cmd))
.
we don't even have conf.env.CC set and get an exception while
defining 'cmd' value, thus it is not defined when the latter except:
statement runs.
I'll look at it.
--
/ Alexander Bokovoy
[SCM] Samba Shared Repository - branch v4-9-test updated
The branch, v4-9-test has been updated via c53bf98 krb5-samba: interdomain trust uses different salt principal via 3dba82d testprogs/blackbox: let test_trust_user_account.sh check the correct kerberos salt via a8be75b testprogs/blackbox: add testit[_expect_failure]_grep() to subunit.sh via 58b3c86 samba-tool: add virtualKerberosSalt attribute to 'user getpassword/syncpasswords' via ab0e26a s4:selftest: test kinit with the interdomain trust user account from bcba25d vfs_fruit: Don't unlink the main file https://git.samba.org/?p=samba.git;a=shortlog;h=v4-9-test - Log - commit c53bf98a629dfa1592aa12cca8166201c872f0db Author: Alexander Bokovoy Date: Fri Feb 16 18:15:28 2018 +0200 krb5-samba: interdomain trust uses different salt principal Salt principal for the interdomain trust is krbtgt/DOMAIN@REALM where DOMAIN is the sAMAccountName without the dollar sign ($) The salt principal for the BLA$ user object was generated wrong. dn: CN=bla.base,CN=System,DC=w4edom-l4,DC=base securityIdentifier: S-1-5-21-4053568372-2049667917-3384589010 trustDirection: 3 trustPartner: bla.base trustPosixOffset: -2147483648 trustType: 2 trustAttributes: 8 flatName: BLA dn: CN=BLA$,CN=Users,DC=w4edom-l4,DC=base userAccountControl: 2080 primaryGroupID: 513 objectSid: S-1-5-21-278041429-3399921908-1452754838-1597 accountExpires: 9223372036854775807 sAMAccountName: BLA$ sAMAccountType: 805306370 pwdLastSet: 131485652467995000 The salt stored by Windows in the package_PrimaryKerberosBlob (within supplementalCredentials) seems to be 'W4EDOM-L4.BASEkrbtgtBLA' for the above trust and Samba stores 'W4EDOM-L4.BASEBLA$'. While the salt used when building the keys from trustAuthOutgoing/trustAuthIncoming is 'W4EDOM-L4.BASEkrbtgtBLA.BASE', which we handle correct. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539 Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Alexander Bokovoy Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Sep 5 03:57:22 CEST 2018 on sn-devel-144 (cherry picked from commit f3e349bebc443133fdbe4e14b148ca8db8237060) Autobuild-User(v4-9-test): Karolin Seeger Autobuild-Date(v4-9-test): Wed Sep 5 15:40:53 CEST 2018 on sn-devel-144 commit 3dba82d3e631c55b71fdfb8bc278d1dfa697a49b Author: Stefan Metzmacher Date: Tue Sep 4 10:53:52 2018 +0200 testprogs/blackbox: let test_trust_user_account.sh check the correct kerberos salt This demonstrates the bug we currently have. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett (cherry picked from commit 1b31fa62567ec549e32c9177b322cfbfb3b6ec1a) commit a8be75bd08a1276a2e27c4b82b2f22c1069e1e8f Author: Stefan Metzmacher Date: Tue Sep 4 10:38:44 2018 +0200 testprogs/blackbox: add testit[_expect_failure]_grep() to subunit.sh BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett (cherry picked from commit 8526feb100e59bc5a15ceb940e6cecce0de59247) commit 58b3c86497373752b41b46b98dcdaa1c51242a11 Author: Stefan Metzmacher Date: Tue Sep 4 10:16:59 2018 +0200 samba-tool: add virtualKerberosSalt attribute to 'user getpassword/syncpasswords' This might be useful for someone, but at least it's very useful for tests. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539 Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett (cherry picked from commit 39c281a23673691bab621de1a632d64df2c1c102) commit ab0e26af17d36ef5e5e708d2c6461f07d7ff7e1c Author: Alexander Bokovoy Date: Fri Feb 16 18:15:28 2018 +0200 s4:selftest: test kinit with the interdomain trust user account To test it, add a blackbox test that ensures we pass a keytab-based authentication with the trust user account for a trusted domain. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539 Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Alexander Bokovoy Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett (cherry picked from commit 7df505298f71432d5adbcffccde8f97c117a57a6) --- Summary of changes: auth/credentials/credentials_krb5.c| 16 +-- lib/krb5_wrap/krb5_samba.c | 61 +++--- lib/krb5_wrap/krb5_samba.h | 2 +- python/samba/netcmd/user.py| 24 ++ source3/passdb/machine_account_secrets.c | 3 +- source
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via aa07400 kdc: Improve code clarity with extra brackets via 41473da heimdal: Change KDC to respect HDB server name type if f.canonicalize is set via f7c409c torture krb5.kdc.canon: Correct principal being checked in TEST_AS_REQ_SELF stage via 9e1ba90 torture: Confirm that this element of the krb5.kdc test does not pass against Windows via 3e5ad20 selftest/samba4.blackbox.export.keytab: Update to use a principal with SPN as UPN via 71ba7cb selftest: Add new test to run krb5.kdc.canon against a user with an SPN for a UPN via a6182bd Revert "s4/heimdal: allow SPNs in AS-REQ" via 364c13a selftest/samba4.blackbox.export.keytab: Remove stray exit 0 and so run cleanup via 630cc6e torture: Add tests to prove that kinit to an SPN is not allowed (unless it is also a UPN) from 8de348e third_party: Import exact files from waf-2.0.8/waflib https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit aa07400f733effc4d42c6d81b6eeb9af8394b38b Author: Andrew Bartlett Date: Mon Sep 3 12:50:39 2018 +1200 kdc: Improve code clarity with extra brackets Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Sep 5 16:17:59 CEST 2018 on sn-devel-144 commit 41473daf09efbc4aed7ab0961ef536f15fca84f6 Author: Andrew Bartlett Date: Mon Sep 3 12:49:40 2018 +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 Reviewed-by: Gary Lockyer commit f7c409c4c833615abbe0291e700b0a9fad55dd13 Author: Andrew Bartlett Date: Mon Sep 3 10:41:10 2018 +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 Reviewed-by: Gary Lockyer commit 9e1ba904d00cc71d5a14c8ec830052cb091302f5 Author: Andrew Bartlett Date: Mon Aug 27 15:01:41 2018 +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 Reviewed-by: Gary Lockyer commit 3e5ad20260f8366f1b1bc954f0199b7fd812bec7 Author: Andrew Bartlett Date: Mon Sep 3 20:26:17 2018 +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 Reviewed-by: Gary Lockyer commit 71ba7cb9b1a5896e6fcdcd6d607339c40d335027 Author: Andrew Bartlett Date: Mon Aug 27 15:00:12 2018 +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 Reviewed-by: Gary Lockyer commit a6182bd9512e6c78cfd2127790419418ab776be9 Author: Andrew Bartlett Date: Thu Nov 30 16:30:49 2017 +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 Reviewed-by: Gary Lockyer commit 364c13ac3d2d1cd05d0f5f375697807c8585f844 Author: Andrew Bartlett Date: Mon Sep 3 16:38:20 2018 +1200 selftest/samba4.blackbox.export.keytab: Remove stray exit 0 and so run cleanup Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer commit 630cc6e6268cfed08b9f21cd77181f82f36ea44b Author: Andrew Bartlett Date: Thu Nov 16 14:01:56 2017 +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 Reviewed-by: Gary Lockyer --- Summary of changes: selftest/selftest.pl | 1 + selftest/target/Samba4.pm| 23 ++ source4/heimdal/kdc/kerberos5.c | 13 +- source4/kdc/db-glue.c| 2 +- source4/selftest/tests.py| 6 + source4/torture/krb5/kdc-canon-heimdal.c | 350 --- source4/torture/krb5/kdc-heimdal.c | 9 +
[SCM] Samba Shared Repository - branch v4-8-test updated
The branch, v4-8-test has been updated
via 3ea96a2 krb5-samba: interdomain trust uses different salt principal
via d726535 testprogs/blackbox: let test_trust_user_account.sh check
the correct kerberos salt
via 04fee9e testprogs/blackbox: add testit[_expect_failure]_grep() to
subunit.sh
via e311e6e samba-tool: add virtualKerberosSalt attribute to 'user
getpassword/syncpasswords'
via 0534104 s4:selftest: test kinit with the interdomain trust user
account
via d39a80c libds: rename UF_MACHINE_ACCOUNT_MASK to
UF_TRUST_ACCOUNT_MASK
via 772600f vfs_fruit: Don't unlink the main file
via 64a9107 torture: Make sure that fruit_ftruncate only unlinks streams
via 37f8294 s3:smbd: add a comment stating that file_close_user() is
redundant for SMB2
via 9fe8691 s3:smbd: let session logoff close files and tcons before
deleting the session
via d36fbe9 s3:smbd: reorder tcon global record deletion and closing
files of a tcon
via e667b17 selftest: add a durable handle test with delayed disconnect
via 34eeed2 s4:selftest: reformat smb2_s3only list
via 3304d86 vfs_delay_inject: adding delay to VFS calls
via a2b04c3 s4:rpc_server/netlogon: don't treet trusted domains as
primary in LogonGetDomainInfo()
via 73e383f s4:rpc_server/netlogon: make use of talloc_zero_array() for
the netr_OneDomainInfo array
via 2e7e58a s4:rpc_server/netlogon: use
samdb_domain_guid()/dsdb_trust_local_tdo_info() to build our netr_OneDomainInfo
values
via e7b4313 s4:dsdb/common: add samdb_domain_guid() helper function
via 66a0554 dsdb:util_trusts: add dsdb_trust_local_tdo_info() helper
function
via 96ae85b dsdb/util_trusts: domain_dn is an input parameter of
dsdb_trust_crossref_tdo_info()
via b7bd12d s4:torture/rpc/netlogon: verify the trusted domains output
of LogonGetDomainInfo()
via 7276bdb s4:torture/rpc/netlogon: assert that
cli_credentials_get_{workstation,password} don't return NULL
via 91a5d38 smbd: Fix a memleak in async search ask sharemode
via 8385a0c ctdb-daemon: Log complete eventd startup command
via f3a2f0b ctdb-daemon: Do not retry connection to eventd
via 0f342d4 ctdb-daemon: Wait for eventd to be ready before connecting
via eb3d91e ctdb-daemon: Open eventd pipe earlier
via a4021fb ctdb-daemon: Improve error handling consistency
via ae515ea ctdb-event: Add support to eventd for the startup
notification FD
via 0e50da4 ctdb-common: Add support for sock daemon to notify of
successful startup
via b53eb6f s3: util: Do not take over stderr when there is no log file
from 1b01025 s3: smbd: Ensure get_real_filename() copes with empty
pathnames.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-8-test
- Log -
commit 3ea96a259258e286284c65e840148b6a7d57a5a8
Author: Alexander Bokovoy
Date: Fri Feb 16 18:15:28 2018 +0200
krb5-samba: interdomain trust uses different salt principal
Salt principal for the interdomain trust is krbtgt/DOMAIN@REALM where
DOMAIN is the sAMAccountName without the dollar sign ($)
The salt principal for the BLA$ user object was generated wrong.
dn: CN=bla.base,CN=System,DC=w4edom-l4,DC=base
securityIdentifier: S-1-5-21-4053568372-2049667917-3384589010
trustDirection: 3
trustPartner: bla.base
trustPosixOffset: -2147483648
trustType: 2
trustAttributes: 8
flatName: BLA
dn: CN=BLA$,CN=Users,DC=w4edom-l4,DC=base
userAccountControl: 2080
primaryGroupID: 513
objectSid: S-1-5-21-278041429-3399921908-1452754838-1597
accountExpires: 9223372036854775807
sAMAccountName: BLA$
sAMAccountType: 805306370
pwdLastSet: 131485652467995000
The salt stored by Windows in the package_PrimaryKerberosBlob
(within supplementalCredentials) seems to be
'W4EDOM-L4.BASEkrbtgtBLA' for the above trust
and Samba stores 'W4EDOM-L4.BASEBLA$'.
While the salt used when building the keys from
trustAuthOutgoing/trustAuthIncoming is
'W4EDOM-L4.BASEkrbtgtBLA.BASE', which we handle correct.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539
Pair-Programmed-With: Stefan Metzmacher
Signed-off-by: Alexander Bokovoy
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andrew Bartlett
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Wed Sep 5 03:57:22 CEST 2018 on sn-devel-144
(cherry picked from commit f3e349bebc443133fdbe4e14b148ca8db8237060)
Autobuild-User(v4-8-test): Stefan Metzmacher
Autobuild-Date(v4-8-test): Wed Sep 5 18:32:05 CEST 2018 on sn-devel-144
commit d726535d61c6c8ac52e387d500841d6bf967186d
Author: Stefan Metzmacher
Date: Tue Sep 4 10:53:52 2018 +0200
testprogs/blackbox: let test_trust_user
[SCM] Samba Shared Repository - branch v4-7-test updated
The branch, v4-7-test has been updated
via dccaea5 krb5-samba: interdomain trust uses different salt principal
via b31ba49 testprogs/blackbox: let test_trust_user_account.sh check
the correct kerberos salt
via 5f89783 testprogs/blackbox: add testit[_expect_failure]_grep() to
subunit.sh
via fab6d42 samba-tool: add virtualKerberosSalt attribute to 'user
getpassword/syncpasswords'
via f7b9267 s4:selftest: test kinit with the interdomain trust user
account
via 38d7e58 libds: rename UF_MACHINE_ACCOUNT_MASK to
UF_TRUST_ACCOUNT_MASK
via 17ed5e0 vfs_fruit: Don't unlink the main file
via 3d8fdc3 torture: Make sure that fruit_ftruncate only unlinks streams
via 0e8298e s3:smbd: add a comment stating that file_close_user() is
redundant for SMB2
via b7c659a s3:smbd: let session logoff close files and tcons before
deleting the session
via 5125304 s3:smbd: reorder tcon global record deletion and closing
files of a tcon
via 6a179a5 selftest: add a durable handle test with delayed disconnect
via 34b4b5b s4:selftest: reformat smb2_s3only list
via ada2165 vfs_delay_inject: adding delay to VFS calls
via fc3d25b s4:rpc_server/netlogon: don't treet trusted domains as
primary in LogonGetDomainInfo()
via f77ea35 s4:rpc_server/netlogon: make use of talloc_zero_array() for
the netr_OneDomainInfo array
via f73ef35 s4:rpc_server/netlogon: use
samdb_domain_guid()/dsdb_trust_local_tdo_info() to build our netr_OneDomainInfo
values
via ecffd79 s4:dsdb/common: add samdb_domain_guid() helper function
via 14a2695 dsdb:util_trusts: add dsdb_trust_local_tdo_info() helper
function
via 467e6ae dsdb/util_trusts: domain_dn is an input parameter of
dsdb_trust_crossref_tdo_info()
via 8e81aa4 s4:torture/rpc/netlogon: verify the trusted domains output
of LogonGetDomainInfo()
via 435e096a s4:torture/rpc/netlogon: assert that
cli_credentials_get_{workstation,password} don't return NULL
via 592bdff smbd: Fix a memleak in async search ask sharemode
via 8f1183d s3: util: Do not take over stderr when there is no log file
from 1cdf976 s3: smbd: Ensure get_real_filename() copes with empty
pathnames.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-test
- Log -
commit dccaea50ce57d6718ffd937cc8b97b64c98c0e79
Author: Alexander Bokovoy
Date: Fri Feb 16 18:15:28 2018 +0200
krb5-samba: interdomain trust uses different salt principal
Salt principal for the interdomain trust is krbtgt/DOMAIN@REALM where
DOMAIN is the sAMAccountName without the dollar sign ($)
The salt principal for the BLA$ user object was generated wrong.
dn: CN=bla.base,CN=System,DC=w4edom-l4,DC=base
securityIdentifier: S-1-5-21-4053568372-2049667917-3384589010
trustDirection: 3
trustPartner: bla.base
trustPosixOffset: -2147483648
trustType: 2
trustAttributes: 8
flatName: BLA
dn: CN=BLA$,CN=Users,DC=w4edom-l4,DC=base
userAccountControl: 2080
primaryGroupID: 513
objectSid: S-1-5-21-278041429-3399921908-1452754838-1597
accountExpires: 9223372036854775807
sAMAccountName: BLA$
sAMAccountType: 805306370
pwdLastSet: 131485652467995000
The salt stored by Windows in the package_PrimaryKerberosBlob
(within supplementalCredentials) seems to be
'W4EDOM-L4.BASEkrbtgtBLA' for the above trust
and Samba stores 'W4EDOM-L4.BASEBLA$'.
While the salt used when building the keys from
trustAuthOutgoing/trustAuthIncoming is
'W4EDOM-L4.BASEkrbtgtBLA.BASE', which we handle correct.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539
Pair-Programmed-With: Stefan Metzmacher
Signed-off-by: Alexander Bokovoy
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andrew Bartlett
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Wed Sep 5 03:57:22 CEST 2018 on sn-devel-144
(cherry picked from commit f3e349bebc443133fdbe4e14b148ca8db8237060)
Autobuild-User(v4-7-test): Stefan Metzmacher
Autobuild-Date(v4-7-test): Wed Sep 5 18:44:46 CEST 2018 on sn-devel-144
commit b31ba498125995dcb67451e4cb28cc27f9e799ed
Author: Stefan Metzmacher
Date: Tue Sep 4 10:53:52 2018 +0200
testprogs/blackbox: let test_trust_user_account.sh check the correct
kerberos salt
This demonstrates the bug we currently have.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13539
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andrew Bartlett
(cherry picked from commit 1b31fa62567ec549e32c9177b322cfbfb3b6ec1a)
commit 5f8978321fea94bab94810bda4ea4b16928fd150
Author: Stefan Metzmacher
Date: Tue Sep 4 10:38:44 2018 +0200
testprogs/blackbox: add testit[_expect_failure]_grep() to subunit.sh
BUG: https:/
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 778878a selftest: Run libsmbclient tests with NT1 and SMB3
via 931e64d s4:torture: Set credentials for libsmbclient correctly
via 0dae4e2 s3:libsmbclient: Add function to set protocol levels
via 50f89bc s3:libsmbclient: Do not call cli_RNetShareEnum if SMB1 is
disabled
via eddcbfe s3:smbclient: Do not call cli_RNetShareEnum if SMB1 is
disabled
via e0e86e8 smbclient: Fix errors printed if we can connect with SMB1
from aa07400 kdc: Improve code clarity with extra brackets
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 778878a39621d88edaf2167719292bb75b86b2be
Author: Andreas Schneider
Date: Mon Sep 3 16:55:02 2018 +0200
selftest: Run libsmbclient tests with NT1 and SMB3
Signed-off-by: Andreas Schneider
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Wed Sep 5 21:56:11 CEST 2018 on sn-devel-144
commit 931e64d2e9e42707c53d32a6cc5006ec734ae4ab
Author: Andreas Schneider
Date: Mon Sep 3 16:36:54 2018 +0200
s4:torture: Set credentials for libsmbclient correctly
Signed-off-by: Andreas Schneider
Reviewed-by: Jeremy Allison
commit 0dae4e2f5c65167fdb2405e232436921a0bb17e6
Author: Andreas Schneider
Date: Tue Sep 4 15:48:03 2018 +0200
s3:libsmbclient: Add function to set protocol levels
Signed-off-by: Andreas Schneider
Reviewed-by: Jeremy Allison
commit 50f89bcdc9473abf69da1fee6f9014df63adc3e3
Author: Andreas Schneider
Date: Tue Sep 4 16:08:58 2018 +0200
s3:libsmbclient: Do not call cli_RNetShareEnum if SMB1 is disabled
Signed-off-by: Andreas Schneider
Reviewed-by: Jeremy Allison
commit eddcbfea91d012f70a00c3ff2865fb1a23bec023
Author: Andreas Schneider
Date: Tue Sep 4 11:11:49 2018 +0200
s3:smbclient: Do not call cli_RNetShareEnum if SMB1 is disabled
Signed-off-by: Andreas Schneider
Reviewed-by: Jeremy Allison
commit e0e86e8ae6245341ffd2b32d6abbade1371046e5
Author: Andreas Schneider
Date: Mon Sep 3 12:11:39 2018 +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
Reviewed-by: Jeremy Allison
---
Summary of changes:
selftest/knownfail | 2 +-
source3/client/client.c| 10 -
source3/include/libsmbclient.h | 19 -
.../{smbclient-0.4.0.sigs => smbclient-0.5.0.sigs} | 1 +
source3/libsmb/clidfs.c| 6 +--
source3/libsmb/libsmb_dir.c| 35
source3/libsmb/libsmb_setget.c | 18 +
source3/libsmb/wscript | 2 +-
source4/selftest/tests.py | 9 +++--
source4/torture/libsmbclient/libsmbclient.c| 46 +-
10 files changed, 118 insertions(+), 30 deletions(-)
copy source3/libsmb/ABI/{smbclient-0.4.0.sigs => smbclient-0.5.0.sigs} (99%)
Changeset truncated at 500 lines:
diff --git a/selftest/knownfail b/selftest/knownfail
index 93c1a35..eef8134 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -125,7 +125,7 @@
^samba4.smb2.acls.*.ACCESSBASED
^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
#^samba4.ldap.dirsync.python.ad_dc_ntvfs..__main__.ExtendedDirsyncTests.*
-^samba4.libsmbclient.opendir.opendir # This requires netbios browsing
+^samba4.libsmbclient.opendir.(NT1|SMB3).opendir # This requires netbios
browsing
^samba4.rpc.drsuapi.*.drsuapi.DsGetDomainControllerInfo\(.*\)$
^samba4.smb2.oplock.exclusive2\(.*\)$ # samba 4 oplocks are a mess
^samba4.smb2.oplock.exclusive5\(.*\)$ # samba 4 oplocks are a mess
diff --git a/source3/client/client.c b/source3/client/client.c
index 25ba01d..fc6d9a3 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4901,6 +4901,7 @@ static bool browse_host_rpc(bool sort)
static bool browse_host(bool sort)
{
int ret;
+
if (!grepable) {
d_printf("\n\tSharename Type Comment\n");
d_printf("\t- ---\n");
@@ -4910,7 +4911,12 @@ static bool browse_host(bool sort)
return true;
}
- if((ret = cli_RNetShareEnum(cli, browse_fn, NULL)) == -1) {
+ if (lp_client_min_protocol() > PROTOCOL
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 05862b7 s4/selftest: enable samba4.schemaInfo.python for py3 via 42dfc98 s4/selftest: Enable samba.tests.blackbox.smbcontrol for py3 via 06f43e9 s4/selftest: enable samba.tests.blackbox.traffic_summary for py3 via d055384 s4/selftest: Enable samba.tests.blackbox.traffic_learner for py3 via ad17284 python/samba/tests: Change native string to binary for py2/py3 compat via 4ca09e4 s4/selftest: samba.tests.blackbox.traffic_replay enabled for py3 via 6401eba s4/selftest: samba.tests.emulate.traffic_packet enable for py3 via 5c2e06f s4/selftest: enable samba.tests.emulate.traffic for py3 via 2a97996 python/samba/emulate: PY3 port of samba.tests.emulate.traffic_packet via 94c9820 python/samba/tests: fix traffic for py2/py3 compatability via 9dd1271 s4/selftest: enable samba.tests.py_credentials for py3 via c73c9be python/samba/tests: port samba.tests.py_credentials for py2/py3 compat via 3fd9b77 auth/credentials: py2/py3 credential key needs to return bytes via 8970ec1 selftest/knownfail.d: Add PY3 rule for samba.tests.py_credentials via 5ffcc32 s4/selftest: enable samba.tests.encrypted_secrets for python3 via e96fcb8 python/samba/tests: PY3 port of samba.tests.encrypted_secrets via c719b03 selftest/knownfail.d: Add PY3 rule for samba.tests.encrypted_secrets via b7909eb s4/selftest: enable samba.tests.password_hash_ldap for python3 via 0854cca s4/selftest: enable samba.tests.password_hash_fl2008 for python3 via 1d18ef2 python/samba/tests: py3 port for samba.test.password_hash_ldap via 5bb286a s4/selftest: enable samba.tests.password_hash_gpgme for python3 via ccbecac python/samba/tests: make password_hash.py py2/py3 compatible via 36c3c7d s4/selftest: enable tdb.python for python3 from 778878a selftest: Run libsmbclient tests with NT1 and SMB3 https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 05862b7bb0e62ba500b68cfc3403a85b00aa61dc Author: Noel Power Date: Thu May 10 13:16:28 2018 +0100 s4/selftest: enable samba4.schemaInfo.python for py3 Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Sep 6 02:27:51 CEST 2018 on sn-devel-144 commit 42dfc985424358061542cdccfadb88f8abc223e9 Author: Noel Power Date: Thu May 10 12:51:19 2018 +0100 s4/selftest: Enable samba.tests.blackbox.smbcontrol for py3 Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett commit 06f43e9b9d1c3cb5714558c64fe25fde227d4764 Author: Noel Power Date: Thu May 10 12:39:36 2018 +0100 s4/selftest: enable samba.tests.blackbox.traffic_summary for py3 Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett commit d0553847fdb4b3ebf8e0a1f11736f5a050da5375 Author: Noel Power Date: Thu May 10 12:36:32 2018 +0100 s4/selftest: Enable samba.tests.blackbox.traffic_learner for py3 Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett commit ad1728417434d437da3e207d838ab8253403359d Author: Noel Power Date: Thu May 10 12:35:58 2018 +0100 python/samba/tests: Change native string to binary for py2/py3 compat Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett commit 4ca09e43bf75b895c16a96b90b6dd9f333cb7873 Author: Noel Power Date: Thu May 10 12:23:08 2018 +0100 s4/selftest: samba.tests.blackbox.traffic_replay enabled for py3 Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett commit 6401eba1850fc271cf7e624a7c6fa71c413bcf75 Author: Noel Power Date: Thu May 10 11:58:35 2018 +0100 s4/selftest: samba.tests.emulate.traffic_packet enable for py3 Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett commit 5c2e06f78ca8fb2d5564ee57f594ac2ce10832b4 Author: Noel Power Date: Wed May 9 20:09:10 2018 +0100 s4/selftest: enable samba.tests.emulate.traffic for py3 Signed-off-by: Noel Power Reviewed-by: Andrew Bartlett commit 2a97996c0aa0aa40cb2280145327cb17bd08df49 Author: Noel Power Date: Thu May 10 11:57:59 2018 +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 Reviewed-by: Andrew Bartlett commit 94c982004f8182bcbe8ade897b2128efde28168d Author: Noel Power Date: Wed May 9 20:05:36 2018 +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 v
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bc62182 ctdb-tests: Check result of write() in ARP and TCP tests
from 05862b7 s4/selftest: enable samba4.schemaInfo.python for py3
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bc62182ff46023494f710a78d5a57a7baffa8780
Author: Martin Schwenke
Date: Wed Sep 5 12:42:07 2018 +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
Reviewed-by: Amitay Isaacs
Autobuild-User(master): Amitay Isaacs
Autobuild-Date(master): Thu Sep 6 08:33:59 CEST 2018 on sn-devel-144
---
Summary of changes:
ctdb/tests/src/system_socket_test.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/tests/src/system_socket_test.c
b/ctdb/tests/src/system_socket_test.c
index 6dd9e43..f7d0c7c 100644
--- a/ctdb/tests/src/system_socket_test.c
+++ b/ctdb/tests/src/system_socket_test.c
@@ -59,6 +59,7 @@ static void test_arp(const char *addr_str, const char
*hwaddr_str, bool reply)
uint8_t buf[512];
size_t buflen = sizeof(buf);
size_t len;
+ ssize_t num_written;
int ret;
ret = ctdb_sock_addr_from_string(addr_str, &addr, false);
@@ -80,7 +81,8 @@ static void test_arp(const char *addr_str, const char
*hwaddr_str, bool reply)
assert(ret == 0);
- write(STDOUT_FILENO, buf, len);
+ num_written = write(STDOUT_FILENO, buf, len);
+ assert(num_written == len);
}
#else /* HAVE_PACKETSOCKET */
@@ -104,6 +106,7 @@ static void test_tcp(const char *src_str,
uint8_t buf[512];
struct ether_header *eth;
size_t expected_len, len;
+ ssize_t num_written;
char src_str_out[64], dst_str_out[64];
uint32_t seq_out, ack_out;
int rst_out;
@@ -156,7 +159,10 @@ static void test_tcp(const char *src_str,
assert(ret == 0);
assert(len == expected_len);
- write(STDOUT_FILENO, buf + sizeof(struct ether_header), len);
+ num_written = write(STDOUT_FILENO,
+ buf + sizeof(struct ether_header),
+ len);
+ assert(num_written == len);
switch (ntohs(eth->ether_type)) {
case ETHERTYPE_IP:
--
Samba Shared Repository
