libcli/security: allow SDDL conditional ACE round-trip for -00 and -0x0

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/libcli/security/sddl_conditional_ace.c b/libcli/security/sddl_conditional_ace.c
index 3d87a2bfafb0d7f4effac274bd8008a30bb4185a..b5d0a3afa3a091a45b2824fc3ba976ec94d82b94 100644 (file)
--- a/libcli/security/sddl_conditional_ace.c
+++ b/libcli/security/sddl_conditional_ace.c
@@ -670,7 +670,7 @@ static bool sddl_write_int(struct sddl_write_context *ctx,
                return sddl_write(ctx, "-0x8000000000000000");
        }
 
-       buf[0] = (v < 0) ? '-' : '+';
+       buf[0] = (sign == CONDITIONAL_ACE_INT_SIGN_NEGATIVE) ? '-' : '+';
 
        if (base == CONDITIONAL_ACE_INT_BASE_8) {
                snprintf(buf + 1, sizeof(buf) - 1, "0%llo", llabs(v));

diff --git a/selftest/knownfail.d/sddl-conditional-ace b/selftest/knownfail.d/sddl-conditional-ace
deleted file mode 100644 (file)
index 6d3a861..0000000
--- a/selftest/knownfail.d/sddl-conditional-ace
+++ /dev/null
@@ -1 +0,0 @@
-amba.unittests.sddl_conditional_ace.test_round_trips