Fix clang 9 constant-conversion warnings

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index caa97b8e868c6ae97a9421087eb6e3bb1e126184..339ad4a708acda4144c4f015d7110ae534925d90 100644 (file)
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -796,7 +796,6 @@ int main(void) {
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=missing-field-initializers', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=unused-function', testflags=True)
             conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=enum-conversion', testflags=True)
-            conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=constant-conversion', testflags=True)
 
     if Options.options.fatal_errors:
         conf.ADD_CFLAGS('-Wfatal-errors', testflags=True)

diff --git a/source4/torture/ndr/dnsp.c b/source4/torture/ndr/dnsp.c
index 3d0cd942d111151f91cfc85c565926b157fd5cfd..3fc58c9429e0aa7d68b167ebbad98081eec84f23 100644 (file)
--- a/source4/torture/ndr/dnsp.c
+++ b/source4/torture/ndr/dnsp.c
@@ -332,7 +332,7 @@ static bool dnsp_dnsProperty_deleted_by_check(struct torture_context *tctx,
        torture_assert_int_equal(tctx, r->version, 1, "version");
        torture_assert_int_equal(tctx, r->id, DSPROPERTY_ZONE_DELETED_FROM_HOSTNAME, "id");
        torture_assert_str_equal(tctx, r->data.deleted_by_hostname, "w2k3-191.w2k3.base", "hostname");
-       torture_assert_int_equal(tctx, r->name, 4092359108, "name (random)");
+       torture_assert_int_equal(tctx, r->name, 0xf3ec71c4, "name (random)");
 
        return true;
 }