git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d098e9c
)
torture/gentest time_skew(): don't use labs() on unsigned NTTIME
author
Douglas Bagnall
<douglas.bagnall@catalyst.net.nz>
Tue, 22 Dec 2015 01:18:19 +0000
(14:18 +1300)
committer
Andrew Bartlett
<abartlet@samba.org>
Thu, 24 Dec 2015 03:09:28 +0000
(
04:09
+0100)
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>
source4/torture/gentest.c
patch
|
blob
|
history
diff --git
a/source4/torture/gentest.c
b/source4/torture/gentest.c
index 41b4aefddad219e225d81e39da0fa5dc9f0ce948..4cd22587c4d96a16d7787832b5fbf18244f68c74 100644
(file)
--- 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;
}