diff options
author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2015-12-22 14:18:19 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2015-12-24 04:09:28 +0100 |
commit | 149c0756b47bbf39a87545caabbb16866319871e (patch) | |
tree | 406ab8efc1c82643b9ea06a43894147d0c130a0f /source4/torture/gentest.c | |
parent | d098e9c4ba90f23589611efbe38c6f5ac4368e16 (diff) | |
download | samba-149c0756b47bbf39a87545caabbb16866319871e.tar.gz |
torture/gentest time_skew(): don't use labs() on unsigned NTTIME
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/torture/gentest.c')
-rw-r--r-- | source4/torture/gentest.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 41b4aefddad..4cd22587c4d 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -295,7 +295,12 @@ static unsigned int time_skew(void) nt0 = servers[0].smb_tree[0]->session->transport->negotiate.server_time; nt1 = servers[1].smb_tree[0]->session->transport->negotiate.server_time; } - ret = labs(nt0 - nt1); + /* Samba's NTTIME is unsigned, abs() won't work! */ + if (nt0 > nt1){ + ret = nt0 - nt1; + } else { + ret = nt1 - nt0; + } return ret + 300; } |