summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-14 02:33:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:08 -0500
commit3f094627193994f08afc8dcf186a7a65c1c350b9 (patch)
treed7506ade62c8fab7ce92f1861414a8860d6a1091 /source4
parent4fec6356ea190d202783fe19013387462a22c441 (diff)
downloadsamba-3f094627193994f08afc8dcf186a7a65c1c350b9.tar.gz
samba-3f094627193994f08afc8dcf186a7a65c1c350b9.tar.bz2
samba-3f094627193994f08afc8dcf186a7a65c1c350b9.zip
r7559: support 64 bit matching in bitops
(This used to be commit 0c44a67001b9ae91c1ba7fc52f22d1eafc22dcc7)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_match.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_match.c b/source4/lib/ldb/ldb_tdb/ldb_match.c
index 5bc59383a5..51b0ab9aa7 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_match.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_match.c
@@ -301,9 +301,9 @@ static int match_leaf(struct ldb_module *module,
*/
static int comparator_and(struct ldb_val *v1, struct ldb_val *v2)
{
- unsigned i1, i2;
- i1 = strtoul(v1->data, NULL, 0);
- i2 = strtoul(v2->data, NULL, 0);
+ uint64_t i1, i2;
+ i1 = strtoull(v1->data, NULL, 0);
+ i2 = strtoull(v2->data, NULL, 0);
return ((i1 & i2) == i2);
}
@@ -312,9 +312,9 @@ static int comparator_and(struct ldb_val *v1, struct ldb_val *v2)
*/
static int comparator_or(struct ldb_val *v1, struct ldb_val *v2)
{
- unsigned i1, i2;
- i1 = strtoul(v1->data, NULL, 0);
- i2 = strtoul(v2->data, NULL, 0);
+ uint64_t i1, i2;
+ i1 = strtoull(v1->data, NULL, 0);
+ i2 = strtoull(v2->data, NULL, 0);
return ((i1 & i2) != 0);
}