[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Sep 19 23:30:02 UTC 2018
The branch, master has been updated
via cf7e771 Fix pdb_samba_dsdb build on Ubuntu 16.04 with -O3 -Werror=strict-overflow
via 1d1cd28 s3: nmbd: Stop nmbd network announce storm.
via 2e59a33 PY3: make sure print stmt is enclosed by '(' & ')'
from c3211c8 s3/locking: Fix comments to reflect code flow
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cf7e7710e15016ce5528d7eed8b58d4d3f4934d3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 17 15:34:33 2018 -0700
Fix pdb_samba_dsdb build on Ubuntu 16.04 with -O3 -Werror=strict-overflow
../source3/passdb/pdb_samba_dsdb.c: In function ‘pdb_samba_dsdb_set_trusteddom_pw’:
../source3/passdb/pdb_samba_dsdb.c:2778:6: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow]
if (i == 0) {
^
cc1: all warnings being treated as errors
gcc version 5.4.0 20160609 (Ubuntu 5.4.0-6ubuntu1~16.04.10)
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu Sep 20 01:29:48 CEST 2018 on sn-devel-144
commit 1d1cd28adaba691ba434a47031fb52ff8887c728
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Sep 17 12:45:14 2018 -0700
s3: nmbd: Stop nmbd network announce storm.
Correct fix for. On announce, work->lastannounce_time is set
to current time t, so we must check that 't >= work->lastannounce_time',
not 't > work->lastannounce_time' otherwise we end up not
doing the comparison, and always doing the announce.
Reported by Reuben Farrelly
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13620
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Revviewe-by: Andreas Schneider <asn at samba.org>
commit 2e59a3343fe162639b103f35ac87b3193927fab5
Author: Noel Power <noel.power at suse.com>
Date: Fri Jul 27 14:37:29 2018 +0100
PY3: make sure print stmt is enclosed by '(' & ')'
Signed-off-by: Noel Power <noel.power at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_conftests.py | 4 ++--
ctdb/wscript | 2 +-
selftest/format-subunit | 4 ++--
source3/nmbd/nmbd_sendannounce.c | 2 +-
source3/passdb/pdb_samba_dsdb.c | 2 +-
source4/heimdal/lib/wind/gen-bidi.py | 2 +-
source4/heimdal/lib/wind/gen-combining.py | 2 +-
source4/heimdal/lib/wind/gen-errorlist.py | 4 ++--
source4/heimdal/lib/wind/gen-map.py | 6 +++---
source4/heimdal/lib/wind/gen-normalize.py | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index 5af57e2..4981ff5 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -493,8 +493,8 @@ def CHECK_XSLTPROC_MANPAGES(conf):
define='XSLTPROC_MANPAGES', on_target=False,
boolean=True)
if not conf.CONFIG_SET('XSLTPROC_MANPAGES'):
- print "A local copy of the docbook.xsl wasn't found on your system" \
- " consider installing package like docbook-xsl"
+ print("A local copy of the docbook.xsl wasn't found on your system" \
+ " consider installing package like docbook-xsl")
#
# Determine the standard libpath for the used compiler,
diff --git a/ctdb/wscript b/ctdb/wscript
index e2e964a..1954f19 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -1139,7 +1139,7 @@ def autotest(ctx):
def show_version(ctx):
- print get_version_string()
+ print(get_version_string())
def manpages(ctx):
diff --git a/selftest/format-subunit b/selftest/format-subunit
index 2506f97..9538ce1 100755
--- a/selftest/format-subunit
+++ b/selftest/format-subunit
@@ -46,7 +46,7 @@ summaryfile = os.path.join(opts.prefix, "summary")
msg_ops.write_summary(summaryfile)
-print "\nA summary with detailed information can be found in:"
-print " %s" % summaryfile
+print("\nA summary with detailed information can be found in:")
+print(" %s" % summaryfile)
sys.exit(expected_ret)
diff --git a/source3/nmbd/nmbd_sendannounce.c b/source3/nmbd/nmbd_sendannounce.c
index 44d67e7..a9cdf1c 100644
--- a/source3/nmbd/nmbd_sendannounce.c
+++ b/source3/nmbd/nmbd_sendannounce.c
@@ -288,7 +288,7 @@ void announce_my_server_names(time_t t)
}
/* Announce every minute at first then progress to every 12 mins */
- if (t > work->lastannounce_time &&
+ if (t >= work->lastannounce_time &&
(t - work->lastannounce_time) < work->announce_interval) {
continue;
}
diff --git a/source3/passdb/pdb_samba_dsdb.c b/source3/passdb/pdb_samba_dsdb.c
index f405c51..2f655c7 100644
--- a/source3/passdb/pdb_samba_dsdb.c
+++ b/source3/passdb/pdb_samba_dsdb.c
@@ -2603,7 +2603,7 @@ static bool pdb_samba_dsdb_set_trusteddom_pw(struct pdb_methods *m,
struct ldb_message *msg = NULL;
int trust_direction_flags;
int trust_type;
- int i;
+ uint32_t i; /* The same type as old_blob.current.count */
const struct ldb_val *old_val = NULL;
struct trustAuthInOutBlob old_blob = {};
uint32_t old_version = 0;
diff --git a/source4/heimdal/lib/wind/gen-bidi.py b/source4/heimdal/lib/wind/gen-bidi.py
index 21839c2..e2efcbb 100644
--- a/source4/heimdal/lib/wind/gen-bidi.py
+++ b/source4/heimdal/lib/wind/gen-bidi.py
@@ -42,7 +42,7 @@ import generate
import rfc3454
if len(sys.argv) != 3:
- print "usage: %s rfc3454.txt outdir" % sys.argv[0]
+ print("usage: %s rfc3454.txt outdir" % sys.argv[0])
sys.exit(1)
tables = rfc3454.read(sys.argv[1])
diff --git a/source4/heimdal/lib/wind/gen-combining.py b/source4/heimdal/lib/wind/gen-combining.py
index 6f23af8..43e0d52 100644
--- a/source4/heimdal/lib/wind/gen-combining.py
+++ b/source4/heimdal/lib/wind/gen-combining.py
@@ -42,7 +42,7 @@ import generate
import UnicodeData
if len(sys.argv) != 3:
- print "usage: %s UnicodeData.txt out-dir" % sys.argv[0]
+ print("usage: %s UnicodeData.txt out-dir" % sys.argv[0])
sys.exit(1)
ud = UnicodeData.read(sys.argv[1])
diff --git a/source4/heimdal/lib/wind/gen-errorlist.py b/source4/heimdal/lib/wind/gen-errorlist.py
index 29ab9a4..97646cf 100644
--- a/source4/heimdal/lib/wind/gen-errorlist.py
+++ b/source4/heimdal/lib/wind/gen-errorlist.py
@@ -44,7 +44,7 @@ import rfc4518
import stringprep
if len(sys.argv) != 3:
- print "usage: %s rfc3454.txt out-dir" % sys.argv[0]
+ print("usage: %s rfc3454.txt out-dir" % sys.argv[0])
sys.exit(1)
tables = rfc3454.read(sys.argv[1])
@@ -104,7 +104,7 @@ for x in trans:
(start, length, description, tables) = x
symbols = stringprep.symbols(error_list, tables)
if len(symbols) == 0:
- print "no symbol for %s" % description
+ print("no symbol for %s" % description)
sys.exit(1)
errorlist_c.file.write(" {0x%x, 0x%x, %s}, /* %s: %s */\n"
% (start, length, symbols, ",".join(tables), description))
diff --git a/source4/heimdal/lib/wind/gen-map.py b/source4/heimdal/lib/wind/gen-map.py
index f109735..dc10d6f 100644
--- a/source4/heimdal/lib/wind/gen-map.py
+++ b/source4/heimdal/lib/wind/gen-map.py
@@ -45,7 +45,7 @@ import stringprep
import util
if len(sys.argv) != 3:
- print "usage: %s rfc3454.txt out-dir" % sys.argv[0]
+ print("usage: %s rfc3454.txt out-dir" % sys.argv[0])
sys.exit(1)
tables = rfc3454.read(sys.argv[1])
@@ -114,7 +114,7 @@ trans = stringprep.sort_merge_trans(trans)
for x in trans:
if x[0] == 0xad:
- print "fooresult %s" % ",".join(x[3])
+ print("fooresult %s" % ",".join(x[3]))
for x in trans:
(key, value, description, table) = x
@@ -130,7 +130,7 @@ for x in trans:
(key, value, description, tables) = x
symbols = stringprep.symbols(map_list, tables)
if len(symbols) == 0:
- print "no symbol for %s %s (%s)" % (key, description, tables)
+ print("no symbol for %s %s (%s)" % (key, description, tables))
sys.exit(1)
v = value.split()
map_c.file.write(" {0x%x, %u, %u, %s}, /* %s: %s */\n"
diff --git a/source4/heimdal/lib/wind/gen-normalize.py b/source4/heimdal/lib/wind/gen-normalize.py
index 0955a54..daf3c3d 100644
--- a/source4/heimdal/lib/wind/gen-normalize.py
+++ b/source4/heimdal/lib/wind/gen-normalize.py
@@ -43,8 +43,8 @@ import UnicodeData
import util
if len(sys.argv) != 4:
- print "usage: %s UnicodeData.txt"
- " CompositionExclusions-3.2.0.txt out-dir" % sys.argv[0]
+ print("usage: %s UnicodeData.txt"
+ " CompositionExclusions-3.2.0.txt out-dir" % sys.argv[0])
sys.exit(1)
ud = UnicodeData.read(sys.argv[1])
--
Samba Shared Repository
More information about the samba-cvs
mailing list