The branch, master has been updated
via 1c3821c9f9c netcmd: Incorrect arguments to Exception constructor
via 1f2ce49bd3a upgradeprovision: Remove duplicate key
via d0483b55216 perf_tests: Implicit string concatenation
via d39715b86ad join: provision_fill does not return anything
from c9350fef6e1 heimdal_build: Improve error and warning handling on
old and new compilers
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1c3821c9f9ce93a7bcaeb26ccdacfba221223110
Author: Garming Sam <garm...@catalyst.net.nz>
Date: Mon Sep 23 15:25:42 2019 +1200
netcmd: Incorrect arguments to Exception constructor
Discovered by Semmle code analysis:
https://lgtm.com/projects/g/samba-team/samba
Signed-off-by: Garming Sam <garm...@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
Autobuild-User(master): Douglas Bagnall <dbagn...@samba.org>
Autobuild-Date(master): Thu Jun 17 05:12:03 UTC 2021 on sn-devel-184
commit 1f2ce49bd3a5fab73f33eab8d7be30ab7d7faa6f
Author: Garming Sam <garm...@catalyst.net.nz>
Date: Mon Sep 23 13:28:44 2019 +1200
upgradeprovision: Remove duplicate key
Discovered by Semmle code analysis:
https://lgtm.com/projects/g/samba-team/samba
Signed-off-by: Garming Sam <garm...@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit d0483b552164e8abe075fa48e33a74ed1fb8ada7
Author: Garming Sam <garm...@catalyst.net.nz>
Date: Mon Sep 23 13:27:13 2019 +1200
perf_tests: Implicit string concatenation
Discovered by Semmle code analysis:
https://lgtm.com/projects/g/samba-team/samba
Signed-off-by: Garming Sam <garm...@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
commit d39715b86ad06293d5055ff2233b8e528623f986
Author: Garming Sam <garm...@catalyst.net.nz>
Date: Mon Sep 23 13:25:47 2019 +1200
join: provision_fill does not return anything
Discovered by Semmle code analysis:
https://lgtm.com/projects/g/samba-team/samba
Signed-off-by: Garming Sam <garm...@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
python/samba/join.py | 14 +++++++-------
python/samba/netcmd/computer.py | 2 +-
selftest/perf_tests.py | 2 +-
source4/scripting/bin/samba_upgradeprovision | 1 -
4 files changed, 9 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/join.py b/python/samba/join.py
index e7563ef9cb8..b557eac03eb 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -917,13 +917,13 @@ class DCJoinContext(object):
secrets_ldb = Ldb(ctx.paths.secrets, session_info=system_session(),
lp=ctx.lp)
- presult = provision_fill(ctx.local_samdb, secrets_ldb,
- ctx.logger, ctx.names, ctx.paths,
- dom_for_fun_level=DS_DOMAIN_FUNCTION_2003,
- targetdir=ctx.targetdir,
samdb_fill=FILL_SUBDOMAIN,
- machinepass=ctx.acct_pass, serverrole="active
directory domain controller",
- lp=ctx.lp, hostip=ctx.names.hostip,
hostip6=ctx.names.hostip6,
- dns_backend=ctx.dns_backend,
adminpass=ctx.adminpass)
+ provision_fill(ctx.local_samdb, secrets_ldb,
+ ctx.logger, ctx.names, ctx.paths,
+ dom_for_fun_level=DS_DOMAIN_FUNCTION_2003,
+ targetdir=ctx.targetdir, samdb_fill=FILL_SUBDOMAIN,
+ machinepass=ctx.acct_pass, serverrole="active directory
domain controller",
+ lp=ctx.lp, hostip=ctx.names.hostip,
hostip6=ctx.names.hostip6,
+ dns_backend=ctx.dns_backend, adminpass=ctx.adminpass)
print("Provision OK for domain %s" % ctx.names.dnsdomain)
def create_replicator(ctx, repl_creds, binding_options):
diff --git a/python/samba/netcmd/computer.py b/python/samba/netcmd/computer.py
index 9d7a220a005..8fa0ab8d1e9 100644
--- a/python/samba/netcmd/computer.py
+++ b/python/samba/netcmd/computer.py
@@ -515,7 +515,7 @@ class cmd_computer_edit(Command):
samdb.modify(res_msg_diff)
except Exception as e:
raise CommandError("Failed to modify computer '%s': " %
- (computername, e))
+ computername, e)
self.outf.write("Modified computer '%s' successfully\n" % computername)
diff --git a/selftest/perf_tests.py b/selftest/perf_tests.py
index 484a4b8b972..2aed9deded9 100644
--- a/selftest/perf_tests.py
+++ b/selftest/perf_tests.py
@@ -71,7 +71,7 @@
plantestsuite_loadlist("samba4.ldb.multi_connect.python(ad_dc_ntvfs)",
"ad_dc_ntvfs",
[python, os.path.join(samba4srcdir,
"dsdb/tests/python/ad_dc_multi_bind.py"),
- 'tdb://$PREFIX_ABS/ad_dc_ntvfs/private/sam.ldb'
+ 'tdb://$PREFIX_ABS/ad_dc_ntvfs/private/sam.ldb',
'$LOADLIST', '$LISTOPT'])
plantestsuite_loadlist("samba4.ldap.vlv.python(ad_dc_ntvfs)", "ad_dc_ntvfs",
diff --git a/source4/scripting/bin/samba_upgradeprovision
b/source4/scripting/bin/samba_upgradeprovision
index 376c4c06318..da3f85c4ae9 100755
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -126,7 +126,6 @@ hashOverwrittenAtt = { "prefixMap": replace,
"systemMayContain": replace,
"adminPropertyPages":replace, "groupType":replace,
"wellKnownObjects":replace, "privilege":never,
"rIDAvailablePool": never,
- "versionNumber" : add,
"rIDNextRID": add, "rIDUsedPool": never,
"defaultSecurityDescriptor": replace + add,
"isMemberOfPartialAttributeSet": delete,
--
Samba Shared Repository
