svn commit: samba r14436 - in branches/SAMBA_4_0/source/lib/ldb/modules: .

[tridge at samba.org]

Author: tridge
Date: 2006-03-15 05:53:56 +0000 (Wed, 15 Mar 2006)
New Revision: 14436

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14436

Log:

mixing of boolean expressions and integers isn't allowed







Modified:
   branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c	2006-03-15 05:53:15 UTC (rev 14435)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/ldb_map.c	2006-03-15 05:53:56 UTC (rev 14436)
@@ -543,7 +543,7 @@
 	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 @@
 				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;
 		}