r25554: Convert last instances of BOOL, True and False to the standard types.

(This used to be commit 566aa14139510788548a874e9213d91317f83ca9)

8 files changed, 31 insertions, 31 deletions

diff --git a/source4/libnet/libnet_group.c b/source4/libnet/libnet_group.c
index 50615f3946..39e5e7a4f9 100644
--- a/source4/libnet/libnet_group.c
+++ b/source4/libnet/libnet_group.c
@@ -57,7 +57,7 @@ struct composite_context* libnet_GroupInfo_send(struct libnet_context *ctx,
 {
 	struct composite_context *c;
 	struct group_info_state *s;
-	BOOL prereq_met = False;
+	bool prereq_met = false;
 	struct composite_context *lookup_req;
 
 	/* composite context allocation and setup */
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 1fd84146de..4abd2954f8 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -926,7 +926,7 @@ static NTSTATUS libnet_Join_primary_domain(struct libnet_context *ctx,
 	r2->in.netbios_name	= netbios_name;
 	r2->in.level		= LIBNET_JOINDOMAIN_AUTOMATIC;
 	r2->in.acct_type	= acct_type;
-	r2->in.recreate_account = False;
+	r2->in.recreate_account = false;
 	status = libnet_JoinDomain(ctx, r2, r2);
 	if (!NT_STATUS_IS_OK(status)) {
 		r->out.error_string = talloc_steal(mem_ctx, r2->out.error_string);
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c
index cac7086a60..459e5b1985 100644
--- a/source4/libnet/libnet_lookup.c
+++ b/source4/libnet/libnet_lookup.c
@@ -260,7 +260,7 @@ struct composite_context* libnet_LookupName_send(struct libnet_context *ctx,
 	struct composite_context *c;
 	struct lookup_name_state *s;
 	struct rpc_request *lookup_req;
-	BOOL prereq_met = False;
+	bool prereq_met = false;
 
 	c = composite_create(mem_ctx, ctx->event_ctx);
 	if (c == NULL) return NULL;
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index c49d800d40..bdc3341aa6 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -247,7 +247,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
 	struct ldb_message **remote_msgs = NULL;
 	int ret, i;
 	uint32_t acb;
-	BOOL add = False;
+	bool add = false;
 	const char *attrs[] = { NULL };
 	/* we may change this to a global search, then fill in only the things not in ldap later */
 	const char *remote_attrs[] = { "userPrincipalName", "servicePrincipalName", 
@@ -275,7 +275,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
 						ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	} else if (ret == 0) {
-		add = True;
+		add = true;
 	} else if (ret > 1) {
 		*error_string = talloc_asprintf(mem_ctx, "More than one user with SID: %s in local LDB", 
 						dom_sid_string(mem_ctx, user_sid));
@@ -517,7 +517,7 @@ static NTSTATUS samsync_ldb_handle_group(TALLOC_CTX *mem_ctx,
 	struct ldb_message *msg;
 	struct ldb_message **msgs;
 	int ret;
-	BOOL add = False;
+	bool add = false;
 	const char *attrs[] = { NULL };
 
 	msg = ldb_msg_new(mem_ctx);
@@ -534,7 +534,7 @@ static NTSTATUS samsync_ldb_handle_group(TALLOC_CTX *mem_ctx,
 		*error_string = talloc_asprintf(mem_ctx, "gendb_search failed: %s", ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	} else if (ret == 0) {
-		add = True;
+		add = true;
 	} else if (ret > 1) {
 		*error_string = talloc_asprintf(mem_ctx, "More than one group/alias with SID: %s", 
 						dom_sid_string(mem_ctx, 
@@ -729,7 +729,7 @@ static NTSTATUS samsync_ldb_handle_alias(TALLOC_CTX *mem_ctx,
 	struct ldb_message *msg;
 	struct ldb_message **msgs;
 	int ret;
-	BOOL add = False;
+	bool add = false;
 	const char *attrs[] = { NULL };
 
 	msg = ldb_msg_new(mem_ctx);
@@ -746,7 +746,7 @@ static NTSTATUS samsync_ldb_handle_alias(TALLOC_CTX *mem_ctx,
 		*error_string = talloc_asprintf(mem_ctx, "gendb_search failed: %s", ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	} else if (ret == 0) {
-		add = True;
+		add = true;
 	} else if (ret > 1) {
 		*error_string = talloc_asprintf(mem_ctx, "More than one group/alias with SID: %s", 
 						dom_sid_string(mem_ctx, 
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index 28b743b42e..75fd8f2000 100644
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -62,7 +62,7 @@ struct composite_context* libnet_CreateUser_send(struct libnet_context *ctx,
 	struct composite_context *c;
 	struct create_user_state *s;
 	struct composite_context *create_req;
-	BOOL prereq_met = False;
+	bool prereq_met = false;
 
 	/* composite context allocation and setup */
 	c = composite_create(mem_ctx, ctx->event_ctx);
@@ -231,7 +231,7 @@ struct composite_context *libnet_DeleteUser_send(struct libnet_context *ctx,
 	struct composite_context *c;
 	struct delete_user_state *s;
 	struct composite_context *delete_req;
-	BOOL prereq_met = False;
+	bool prereq_met = false;
 
 	/* composite context allocation and setup */
 	c = composite_create(mem_ctx, ctx->event_ctx);
@@ -402,7 +402,7 @@ struct composite_context *libnet_ModifyUser_send(struct libnet_context *ctx,
 	struct composite_context *c;
 	struct modify_user_state *s;
 	struct composite_context *userinfo_req;
-	BOOL prereq_met = False;
+	bool prereq_met = false;
 
 	c = composite_create(mem_ctx, ctx->event_ctx);
 	if (c == NULL) return NULL;
@@ -629,7 +629,7 @@ struct composite_context* libnet_UserInfo_send(struct libnet_context *ctx,
 	struct composite_context *c;
 	struct user_info_state *s;
 	struct composite_context *lookup_req;
-	BOOL prereq_met = False;
+	bool prereq_met = false;
 
 	/* composite context allocation and setup */
 	c = composite_create(mem_ctx, ctx->event_ctx);
@@ -878,7 +878,7 @@ struct composite_context* libnet_UserList_send(struct libnet_context *ctx,
 	struct composite_context *c;
 	struct userlist_state *s;
 	struct rpc_request *query_req;
-	BOOL prereq_met = False;
+	bool prereq_met = false;
 
 	/* composite context allocation and setup */
 	c = composite_create(mem_ctx, ctx->event_ctx);
@@ -952,7 +952,7 @@ static void continue_domain_queried(struct rpc_request *req)
 	struct composite_context *c;
 	struct userlist_state *s;
 	struct rpc_request *enum_req;
-	BOOL prereq_met = False;
+	bool prereq_met = false;
 	
 	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userlist_state);
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index c6f85d5b5f..dff915df71 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -81,7 +81,7 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
 				} else {
 					user->lmpassword = keys.keys.keys2.lmpassword.pwd;
 				}
-				user->lm_password_present = True;
+				user->lm_password_present = true;
 			}
 			if (keys.keys.keys2.ntpassword.length == 16) {
 				if (rid_crypt) {
@@ -90,7 +90,7 @@ static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
 				} else {
 					user->ntpassword = keys.keys.keys2.ntpassword.pwd;
 				}
-				user->nt_password_present = True;
+				user->nt_password_present = true;
 			}
 			/* TODO: rid decrypt history fields */
 		} else {
diff --git a/source4/libnet/prereq_domain.c b/source4/libnet/prereq_domain.c
index 52f8dcf112..e10e550585 100644
--- a/source4/libnet/prereq_domain.c
+++ b/source4/libnet/prereq_domain.c
@@ -29,7 +29,7 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 
 
-BOOL samr_domain_opened(struct libnet_context *ctx, const char *domain_name,
+bool samr_domain_opened(struct libnet_context *ctx, const char *domain_name,
 			struct composite_context **parent_ctx,
 			struct libnet_DomainOpen *domain_open,
 			void (*continue_fn)(struct composite_context*),
@@ -37,7 +37,7 @@ BOOL samr_domain_opened(struct libnet_context *ctx, const char *domain_name,
 {
 	struct composite_context *domopen_req;
 
-	if (parent_ctx == NULL || *parent_ctx == NULL) return False;
+	if (parent_ctx == NULL || *parent_ctx == NULL) return false;
 
 	if (domain_name == NULL) {
 		/*
@@ -52,7 +52,7 @@ BOOL samr_domain_opened(struct libnet_context *ctx, const char *domain_name,
 
 		} else {
 			composite_error(*parent_ctx, NT_STATUS_INVALID_PARAMETER);
-			return True;
+			return true;
 		}
 
 	} else {
@@ -71,20 +71,20 @@ BOOL samr_domain_opened(struct libnet_context *ctx, const char *domain_name,
 		} else {
 			/* domain has already been opened and it's the same domain
 			   as requested */
-			return True;
+			return true;
 		}
 	}
 
 	/* send request to open the domain */
 	domopen_req = libnet_DomainOpen_send(ctx, domain_open, monitor);
-	if (composite_nomem(domopen_req, *parent_ctx)) return False;
+	if (composite_nomem(domopen_req, *parent_ctx)) return false;
 	
 	composite_continue(*parent_ctx, domopen_req, continue_fn, *parent_ctx);
-	return False;
+	return false;
 }
 
 
-BOOL lsa_domain_opened(struct libnet_context *ctx, const char *domain_name,
+bool lsa_domain_opened(struct libnet_context *ctx, const char *domain_name,
 		       struct composite_context **parent_ctx,
 		       struct libnet_DomainOpen *domain_open,
 		       void (*continue_fn)(struct composite_context*),
@@ -92,7 +92,7 @@ BOOL lsa_domain_opened(struct libnet_context *ctx, const char *domain_name,
 {
 	struct composite_context *domopen_req;
 	
-	if (parent_ctx == NULL || *parent_ctx == NULL) return False;
+	if (parent_ctx == NULL || *parent_ctx == NULL) return false;
 
 	if (domain_name == NULL) {
 		/*
@@ -109,7 +109,7 @@ BOOL lsa_domain_opened(struct libnet_context *ctx, const char *domain_name,
 			composite_error(*parent_ctx, NT_STATUS_INVALID_PARAMETER);
 			/* this ensures the calling function exits and composite function error
 			   gets noticed quickly */
-			return True;
+			return true;
 		}
 
 	} else {
@@ -128,15 +128,15 @@ BOOL lsa_domain_opened(struct libnet_context *ctx, const char *domain_name,
 		} else {
 			/* domain has already been opened and it's the same domain
 			   as requested */
-			return True;
+			return true;
 		}
 	}
 
 	/* send request to open the domain */
 	domopen_req = libnet_DomainOpen_send(ctx, domain_open, monitor);
 	/* see the comment above to find out why true is returned here */
-	if (composite_nomem(domopen_req, *parent_ctx)) return True;
+	if (composite_nomem(domopen_req, *parent_ctx)) return true;
 	
 	composite_continue(*parent_ctx, domopen_req, continue_fn, *parent_ctx);
-	return False;
+	return false;
 }
diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c
index fd2f75bc64..25ed4775cb 100644
--- a/source4/libnet/userman.c
+++ b/source4/libnet/userman.c
@@ -662,7 +662,7 @@ static NTSTATUS usermod_change(struct composite_context *c,
 	uint16_t level = 27;
 
 	/* prepare UserInfo level and data based on bitmask field */
-	do_set = usermod_setfields(s, &level, i, False);
+	do_set = usermod_setfields(s, &level, i, false);
 
 	if (level < 1 || level > 26) {
 		/* apparently there's a field that the setfields routine
@@ -752,7 +752,7 @@ static void continue_usermod_user_queried(struct rpc_request *req)
 	   of many) */
 	s->info = *s->queryuser.out.info;
 
-	usermod_setfields(s, &level, i, True);
+	usermod_setfields(s, &level, i, true);
 
 	/* prepare rpc call arguments */
 	s->setuser.in.user_handle  = &s->user_handle;