summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-03-15 05:53:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:24 -0500
commit2e959619c1a5e839fc9ac94b729ce85705944971 (patch)
tree7182b3c26705dcb9508eaa3237e73669150b9ccb /source4
parent57026269068b035a2f32e971784ab31883854398 (diff)
downloadsamba-2e959619c1a5e839fc9ac94b729ce85705944971.tar.gz
samba-2e959619c1a5e839fc9ac94b729ce85705944971.tar.bz2
samba-2e959619c1a5e839fc9ac94b729ce85705944971.zip
r14436: mixing of boolean expressions and integers isn't allowed
(This used to be commit 6f7d09262d2e92df137167da55f5a22f32490781)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/modules/ldb_map.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c
index f313a6e564..ecb49de440 100644
--- a/source4/lib/ldb/modules/ldb_map.c
+++ b/source4/lib/ldb/modules/ldb_map.c
@@ -543,7 +543,7 @@ static const char **available_local_attributes(struct ldb_module *module, const
ret[0] = NULL;
for (i = 0; privdat->attribute_maps[i].local_name; i++) {
- int avail = 0;
+ BOOL avail = False;
const struct ldb_map_attribute *attr = &privdat->attribute_maps[i];
/* If all remote attributes for this attribute are present, add the
@@ -561,9 +561,9 @@ static const char **available_local_attributes(struct ldb_module *module, const
break;
case MAP_GENERATE:
- avail = 1;
+ avail = True;
for (j = 0; attr->u.generate.remote_names[j]; j++) {
- avail &= (ldb_msg_find_ldb_val(msg, attr->u.generate.remote_names[j]) != NULL);
+ avail &= (BOOL)(ldb_msg_find_ldb_val(msg, attr->u.generate.remote_names[j]) != NULL);
}
break;
}