r25553: Convert to standard bool type.

(This used to be commit b7371f1a191fb86834c0d586d094f39f0b04544b)

10 files changed, 81 insertions, 81 deletions

diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index 677faccf36..c6f93f076a 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -123,7 +123,7 @@ _PUBLIC_ uint32_t dcesrv_common_get_server_type(TALLOC_CTX *mem_ctx, struct dces
 				DEBUG(2,("Unable to open samdb in determining server announce flags\n"));
 			} else {
 				/* Determine if we are the pdc */
-				BOOL is_pdc = samdb_is_pdc(samctx);
+				bool is_pdc = samdb_is_pdc(samctx);
 				if (is_pdc) {
 					default_server_announce |= SV_TYPE_DOMAIN_CTRL;
 				} else {
@@ -148,7 +148,7 @@ _PUBLIC_ uint32_t dcesrv_common_get_server_type(TALLOC_CTX *mem_ctx, struct dces
 #if 0
 	{ 
 		/* TODO: announce us as print server when we are a print server */
-		BOOL is_print_server = False;
+		bool is_print_server = false;
 		if (is_print_server) {
 			default_server_announce |= SV_TYPE_PRINTQ_SERVER;
 		}
@@ -210,8 +210,8 @@ _PUBLIC_ const char *dcesrv_common_get_userpath(TALLOC_CTX *mem_ctx, struct dces
 _PUBLIC_ bool dcesrv_common_validate_share_name(TALLOC_CTX *mem_ctx, const char *share_name)
 {
 	if (strpbrk(share_name, INVALID_SHARE_NAME_CHARS)) {
-		return False;
+		return false;
 	}
 
-	return True;
+	return true;
 }
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 02f38a15fd..4388c86f22 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -88,7 +88,7 @@ static struct dcesrv_connection_context *dcesrv_find_context(struct dcesrv_conne
 /*
   see if a uuid and if_version match to an interface
 */
-static BOOL interface_match(const struct dcesrv_interface *if1,
+static bool interface_match(const struct dcesrv_interface *if1,
 							const struct dcesrv_interface *if2)
 {
 	return (if1->syntax_id.if_version == if2->syntax_id.if_version && 
@@ -113,7 +113,7 @@ static const struct dcesrv_interface *find_interface(const struct dcesrv_endpoin
 /*
   see if a uuid and if_version match to an interface
 */
-static BOOL interface_match_by_uuid(const struct dcesrv_interface *iface,
+static bool interface_match_by_uuid(const struct dcesrv_interface *iface,
 				    const struct GUID *uuid, uint32_t if_version)
 {
 	return (iface->syntax_id.if_version == if_version && 
@@ -160,7 +160,7 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
 	struct dcesrv_endpoint *ep;
 	struct dcesrv_if_list *ifl;
 	struct dcerpc_binding *binding;
-	BOOL add_ep = False;
+	bool add_ep = false;
 	NTSTATUS status;
 	
 	status = dcerpc_parse_binding(dce_ctx, ep_name, &binding);
@@ -179,7 +179,7 @@ _PUBLIC_ NTSTATUS dcesrv_interface_register(struct dcesrv_context *dce_ctx,
 		}
 		ZERO_STRUCTP(ep);
 		ep->ep_description = talloc_reference(ep, binding);
-		add_ep = True;
+		add_ep = true;
 
 		/* add mgmt interface */
 		ifl = talloc(dce_ctx, struct dcesrv_if_list);
@@ -338,7 +338,7 @@ NTSTATUS dcesrv_endpoint_connect(struct dcesrv_context *dce_ctx,
 	p->event_ctx = event_ctx;
 	p->msg_ctx = msg_ctx;
 	p->server_id = server_id;
-	p->processing = False;
+	p->processing = false;
 	p->state_flags = state_flags;
 	ZERO_STRUCT(p->transport);
 
@@ -983,15 +983,15 @@ _PUBLIC_ struct socket_address *dcesrv_connection_get_peer_addr(struct dcesrv_co
 /*
   work out if we have a full packet yet
 */
-static BOOL dce_full_packet(const DATA_BLOB *data)
+static bool dce_full_packet(const DATA_BLOB *data)
 {
 	if (data->length < DCERPC_FRAG_LEN_OFFSET+2) {
-		return False;
+		return false;
 	}
 	if (dcerpc_get_frag_length(data) > data->length) {
-		return False;
+		return false;
 	}
-	return True;
+	return true;
 }
 
 /*
diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
index 0843a43761..911cfe4799 100644
--- a/source4/rpc_server/dcesrv_auth.c
+++ b/source4/rpc_server/dcesrv_auth.c
@@ -29,10 +29,10 @@
 
 /*
   parse any auth information from a dcerpc bind request
-  return False if we can't handle the auth request for some 
+  return false if we can't handle the auth request for some 
   reason (in which case we send a bind_nak)
 */
-BOOL dcesrv_auth_bind(struct dcesrv_call_state *call)
+bool dcesrv_auth_bind(struct dcesrv_call_state *call)
 {
 	struct cli_credentials *server_credentials;
 	struct ncacn_packet *pkt = &call->pkt;
@@ -42,12 +42,12 @@ BOOL dcesrv_auth_bind(struct dcesrv_call_state *call)
 
 	if (pkt->u.bind.auth_info.length == 0) {
 		dce_conn->auth_state.auth_info = NULL;
-		return True;
+		return true;
 	}
 
 	dce_conn->auth_state.auth_info = talloc(dce_conn, struct dcerpc_auth);
 	if (!dce_conn->auth_state.auth_info) {
-		return False;
+		return false;
 	}
 
 	status = ndr_pull_struct_blob(&pkt->u.bind.auth_info,
@@ -55,20 +55,20 @@ BOOL dcesrv_auth_bind(struct dcesrv_call_state *call)
 				      dce_conn->auth_state.auth_info,
 				      (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);
 	if (!NT_STATUS_IS_OK(status)) {
-		return False;
+		return false;
 	}
 
 	status = gensec_server_start(dce_conn, call->event_ctx, call->msg_ctx, &auth->gensec_security);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("Failed to start GENSEC for DCERPC server: %s\n", nt_errstr(status)));
-		return False;
+		return false;
 	}
 
 	server_credentials 
 		= cli_credentials_init(call);
 	if (!server_credentials) {
 		DEBUG(1, ("Failed to init server credentials\n"));
-		return False;
+		return false;
 	}
 	
 	cli_credentials_set_conf(server_credentials, global_loadparm);
@@ -89,10 +89,10 @@ BOOL dcesrv_auth_bind(struct dcesrv_call_state *call)
 			  (int)auth->auth_info->auth_type,
 			  (int)auth->auth_info->auth_level,
 			  nt_errstr(status)));
-		return False;
+		return false;
 	}
 
-	return True;
+	return true;
 }
 
 /*
@@ -138,7 +138,7 @@ NTSTATUS dcesrv_auth_bind_ack(struct dcesrv_call_state *call, struct ncacn_packe
 /*
   process the final stage of a auth request
 */
-BOOL dcesrv_auth_auth3(struct dcesrv_call_state *call)
+bool dcesrv_auth_auth3(struct dcesrv_call_state *call)
 {
 	struct ncacn_packet *pkt = &call->pkt;
 	struct dcesrv_connection *dce_conn = call->conn;
@@ -148,7 +148,7 @@ BOOL dcesrv_auth_auth3(struct dcesrv_call_state *call)
 	if (!dce_conn->auth_state.auth_info ||
 	    !dce_conn->auth_state.gensec_security ||
 	    pkt->u.auth3.auth_info.length == 0) {
-		return False;
+		return false;
 	}
 
 	status = ndr_pull_struct_blob(&pkt->u.auth3.auth_info,
@@ -156,7 +156,7 @@ BOOL dcesrv_auth_auth3(struct dcesrv_call_state *call)
 				      dce_conn->auth_state.auth_info,
 				      (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);
 	if (!NT_STATUS_IS_OK(status)) {
-		return False;
+		return false;
 	}
 
 	/* Pass the extra data we got from the client down to gensec for processing */
@@ -169,26 +169,26 @@ BOOL dcesrv_auth_auth3(struct dcesrv_call_state *call)
 					     &dce_conn->auth_state.session_info);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(1, ("Failed to establish session_info: %s\n", nt_errstr(status)));
-			return False;
+			return false;
 		}
 		/* Now that we are authenticated, go back to the generic session key... */
 		dce_conn->auth_state.session_key = dcesrv_generic_session_key;
-		return True;
+		return true;
 	} else {
 		DEBUG(4, ("dcesrv_auth_auth3: failed to authenticate: %s\n", 
 			  nt_errstr(status)));
-		return False;
+		return false;
 	}
 
-	return True;
+	return true;
 }
 
 /*
   parse any auth information from a dcerpc alter request
-  return False if we can't handle the auth request for some 
+  return false if we can't handle the auth request for some 
   reason (in which case we send a bind_nak (is this true for here?))
 */
-BOOL dcesrv_auth_alter(struct dcesrv_call_state *call)
+bool dcesrv_auth_alter(struct dcesrv_call_state *call)
 {
 	struct ncacn_packet *pkt = &call->pkt;
 	struct dcesrv_connection *dce_conn = call->conn;
@@ -196,17 +196,17 @@ BOOL dcesrv_auth_alter(struct dcesrv_call_state *call)
 
 	/* on a pure interface change there is no auth blob */
 	if (pkt->u.alter.auth_info.length == 0) {
-		return True;
+		return true;
 	}
 
 	/* We can't work without an existing gensec state */
 	if (!dce_conn->auth_state.gensec_security) {
-		return False;
+		return false;
 	}
 
 	dce_conn->auth_state.auth_info = talloc(dce_conn, struct dcerpc_auth);
 	if (!dce_conn->auth_state.auth_info) {
-		return False;
+		return false;
 	}
 
 	status = ndr_pull_struct_blob(&pkt->u.alter.auth_info,
@@ -214,10 +214,10 @@ BOOL dcesrv_auth_alter(struct dcesrv_call_state *call)
 				      dce_conn->auth_state.auth_info,
 				      (ndr_pull_flags_fn_t)ndr_pull_dcerpc_auth);
 	if (!NT_STATUS_IS_OK(status)) {
-		return False;
+		return false;
 	}
 
-	return True;
+	return true;
 }
 
 /*
@@ -296,7 +296,7 @@ static NTSTATUS dcesrv_check_connect_verifier(DATA_BLOB *blob)
 /*
   check credentials on a request
 */
-BOOL dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet)
+bool dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet)
 {
 	struct ncacn_packet *pkt = &call->pkt;
 	struct dcesrv_connection *dce_conn = call->conn;
@@ -307,14 +307,14 @@ BOOL dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet)
 
 	if (!dce_conn->auth_state.auth_info ||
 	    !dce_conn->auth_state.gensec_security) {
-		return True;
+		return true;
 	}
 
 	auth_blob.length = 8 + pkt->auth_length;
 
 	/* check for a valid length */
 	if (pkt->u.request.stub_and_verifier.length < auth_blob.length) {
-		return False;
+		return false;
 	}
 
 	auth_blob.data = 
@@ -325,7 +325,7 @@ BOOL dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet)
 	/* pull the auth structure */
 	ndr = ndr_pull_init_blob(&auth_blob, call);
 	if (!ndr) {
-		return False;
+		return false;
 	}
 
 	if (!(pkt->drep[0] & DCERPC_DREP_LE)) {
@@ -335,7 +335,7 @@ BOOL dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet)
 	status = ndr_pull_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS, &auth);
 	if (!NT_STATUS_IS_OK(status)) {
 		talloc_free(ndr);
-		return False;
+		return false;
 	}
 
 	/* check signature or unseal the packet */
@@ -375,7 +375,7 @@ BOOL dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet)
 	/* remove the indicated amount of padding */
 	if (pkt->u.request.stub_and_verifier.length < auth.auth_pad_length) {
 		talloc_free(ndr);
-		return False;
+		return false;
 	}
 	pkt->u.request.stub_and_verifier.length -= auth.auth_pad_length;
 	talloc_free(ndr);
@@ -387,7 +387,7 @@ BOOL dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet)
 /* 
    push a signed or sealed dcerpc request packet into a blob
 */
-BOOL dcesrv_auth_response(struct dcesrv_call_state *call,
+bool dcesrv_auth_response(struct dcesrv_call_state *call,
 			  DATA_BLOB *blob, struct ncacn_packet *pkt)
 {
 	struct dcesrv_connection *dce_conn = call->conn;
@@ -404,7 +404,7 @@ BOOL dcesrv_auth_response(struct dcesrv_call_state *call,
 
 	ndr = ndr_push_init_ctx(call);
 	if (!ndr) {
-		return False;
+		return false;
 	}
 
 	if (!(pkt->drep[0] & DCERPC_DREP_LE)) {
@@ -413,7 +413,7 @@ BOOL dcesrv_auth_response(struct dcesrv_call_state *call,
 
 	status = ndr_push_ncacn_packet(ndr, NDR_SCALARS|NDR_BUFFERS, pkt);
 	if (!NT_STATUS_IS_OK(status)) {
-		return False;
+		return false;
 	}
 
 	/* pad to 16 byte multiple, match win2k3 */
@@ -426,7 +426,7 @@ BOOL dcesrv_auth_response(struct dcesrv_call_state *call,
 		status = dcesrv_connect_verifier(call,
 						 &dce_conn->auth_state.auth_info->credentials);
 		if (!NT_STATUS_IS_OK(status)) {
-			return False;
+			return false;
 		}
 	} else {
 
@@ -444,7 +444,7 @@ BOOL dcesrv_auth_response(struct dcesrv_call_state *call,
 	status = ndr_push_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS, 
 				      dce_conn->auth_state.auth_info);
 	if (!NT_STATUS_IS_OK(status)) {
-		return False;
+		return false;
 	}
 
 	/* extract the whole packet as a blob */
@@ -519,8 +519,8 @@ BOOL dcesrv_auth_response(struct dcesrv_call_state *call,
 	data_blob_free(&dce_conn->auth_state.auth_info->credentials);
 
 	if (!NT_STATUS_IS_OK(status)) {
-		return False;
+		return false;
 	}	
 
-	return True;
+	return true;
 }
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index 0c22e856f2..d8b361ca27 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -589,7 +589,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
 						return WERR_GENERAL_FAILURE;
 					}
 					if (res_domain->count == 1) {
-						ctr1->array[i].is_pdc = True;
+						ctr1->array[i].is_pdc = true;
 					}
 				}
 			}
@@ -603,7 +603,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
 			ctr1->array[i].server_dn = ldb_dn_get_linearized(res->msgs[i]->dn);
 
 
-			ctr1->array[i].is_enabled = True;
+			ctr1->array[i].is_enabled = true;
 
 		}
 		break;
@@ -681,7 +681,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
 								 LDB_SCOPE_BASE, attrs_none, "fSMORoleOwner=%s",
 								 ldb_dn_get_linearized(ntds_dn));
 					if (ret == LDB_SUCCESS && res_domain->count == 1) {
-						ctr2->array[i].is_pdc = True;
+						ctr2->array[i].is_pdc = true;
 					}
 					if ((ret != LDB_SUCCESS) && (ret != LDB_ERR_NO_SUCH_OBJECT)) {
 						DEBUG(5, ("warning: searching for domain DN %s failed: %s\n", 
@@ -700,7 +700,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
 			ctr2->array[i].server_guid 
 				= samdb_result_guid(res->msgs[i], "objectGUID");
 
-			ctr2->array[i].is_enabled = True;
+			ctr2->array[i].is_enabled = true;
 
 		}
 		break;
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index a580487b6f..25d6f8c8f7 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -44,7 +44,7 @@ struct lsa_secret_state {
 	uint32_t access_mask;
 	struct ldb_dn *secret_dn;
 	struct ldb_context *sam_ldb;
-	BOOL global;
+	bool global;
 };
 
 /*
@@ -1674,7 +1674,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 		const char *name2;
 		name = &r->in.name.string[2];
 		secret_state->sam_ldb = talloc_reference(secret_state, policy_state->sam_ldb);
-		secret_state->global = True;
+		secret_state->global = true;
 
 		if (strlen(name) < 1) {
 			return NT_STATUS_INVALID_PARAMETER;
@@ -1704,7 +1704,7 @@ static NTSTATUS dcesrv_lsa_CreateSecret(struct dcesrv_call_state *dce_call, TALL
 		samdb_msg_add_string(secret_state->sam_ldb, mem_ctx, msg, "cn", name2);
 	
 	} else {
-		secret_state->global = False;
+		secret_state->global = false;
 
 		name = r->in.name.string;
 		if (strlen(name) < 1) {
@@ -1807,7 +1807,7 @@ static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC
 	if (strncmp("G$", r->in.name.string, 2) == 0) {
 		name = &r->in.name.string[2];
 		secret_state->sam_ldb = talloc_reference(secret_state, policy_state->sam_ldb);
-		secret_state->global = True;
+		secret_state->global = true;
 
 		if (strlen(name) < 1) {
 			return NT_STATUS_INVALID_PARAMETER;
@@ -1831,7 +1831,7 @@ static NTSTATUS dcesrv_lsa_OpenSecret(struct dcesrv_call_state *dce_call, TALLOC
 	} else {
 		secret_state->sam_ldb = talloc_reference(secret_state, secrets_db_connect(mem_ctx));
 
-		secret_state->global = False;
+		secret_state->global = false;
 		name = r->in.name.string;
 		if (strlen(name) < 1) {
 			return NT_STATUS_INVALID_PARAMETER;
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 2d551da4d1..45277dc3ed 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -313,7 +313,7 @@ static NTSTATUS dcesrv_netr_ServerPasswordSet(struct dcesrv_call_state *dce_call
 					   creds->sid,
 					   NULL, /* Don't have plaintext */
 					   NULL, &r->in.new_password,
-					   False, /* This is not considered a password change */
+					   false, /* This is not considered a password change */
 					   NULL, NULL);
 	return nt_status;
 }
@@ -330,7 +330,7 @@ static NTSTATUS dcesrv_netr_ServerPasswordSet2(struct dcesrv_call_state *dce_cal
 	NTSTATUS nt_status;
 	char new_pass[512];
 	uint32_t new_pass_len;
-	BOOL ret;
+	bool ret;
 
 	struct samr_CryptPassword password_buf;
 
@@ -360,7 +360,7 @@ static NTSTATUS dcesrv_netr_ServerPasswordSet2(struct dcesrv_call_state *dce_cal
 					   creds->sid,
 					   new_pass, /* we have plaintext */
 					   NULL, NULL,
-					   False, /* This is not considered a password change */
+					   false, /* This is not considered a password change */
 					   NULL, NULL);
 	return nt_status;
 }
@@ -410,7 +410,7 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_base(struct dcesrv_call_state *dce_cal
 	NT_STATUS_HAVE_NO_MEMORY(user_info);
 
 	user_info->flags = 0;
-	user_info->mapped_state = False;
+	user_info->mapped_state = false;
 	user_info->remote_host = NULL;
 
 	switch (r->in.logon_level) {
@@ -836,7 +836,7 @@ static NTSTATUS fill_domain_trust_info(TALLOC_CTX *mem_ctx,
 				       struct ldb_message *res,
 				       struct ldb_message *ref_res,
 				       struct netr_DomainTrustInfo *info, 
-				       BOOL is_local)
+				       bool is_local)
 {
 	ZERO_STRUCTP(info);
 
@@ -926,15 +926,15 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
 				       info1->num_trusts);
 	NT_STATUS_HAVE_NO_MEMORY(info1->trusts);
 
-	status = fill_domain_trust_info(mem_ctx, res1[0], ref_res[0], &info1->domaininfo, True);
+	status = fill_domain_trust_info(mem_ctx, res1[0], ref_res[0], &info1->domaininfo, true);
 	NT_STATUS_NOT_OK_RETURN(status);
 
 	for (i=0;i<ret2;i++) {
-		status = fill_domain_trust_info(mem_ctx, res2[i], NULL, &info1->trusts[i], False);
+		status = fill_domain_trust_info(mem_ctx, res2[i], NULL, &info1->trusts[i], false);
 		NT_STATUS_NOT_OK_RETURN(status);
 	}
 
-	status = fill_domain_trust_info(mem_ctx, res1[0], ref_res[0], &info1->trusts[i], True);
+	status = fill_domain_trust_info(mem_ctx, res1[0], ref_res[0], &info1->trusts[i], true);
 	NT_STATUS_NOT_OK_RETURN(status);
 
 	r->out.info.info1 = info1;
diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index 40eab55c92..f009323ae2 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -43,7 +43,7 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
 	const char *binding = lp_parm_string(global_loadparm, NULL, "dcerpc_remote", "binding");
 	const char *user, *pass, *domain;
 	struct cli_credentials *credentials;
-	BOOL machine_account;
+	bool machine_account;
 
 	machine_account = lp_parm_bool(global_loadparm, NULL, "dcerpc_remote", "use_machine_account", false);
 
@@ -253,7 +253,7 @@ static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const stru
 	return NT_STATUS_OK;
 }
 
-static BOOL remote_fill_interface(struct dcesrv_interface *iface, const struct ndr_interface_table *if_tabl)
+static bool remote_fill_interface(struct dcesrv_interface *iface, const struct ndr_interface_table *if_tabl)
 {
 	iface->name = if_tabl->name;
 	iface->syntax_id = if_tabl->syntax_id;
@@ -268,10 +268,10 @@ static BOOL remote_fill_interface(struct dcesrv_interface *iface, const struct n
 
 	iface->private = if_tabl;
 
-	return True;
+	return true;
 }
 
-static BOOL remote_op_interface_by_uuid(struct dcesrv_interface *iface, const struct GUID *uuid, uint32_t if_version)
+static bool remote_op_interface_by_uuid(struct dcesrv_interface *iface, const struct GUID *uuid, uint32_t if_version)
 {
 	const struct ndr_interface_list *l;
 
@@ -282,17 +282,17 @@ static BOOL remote_op_interface_by_uuid(struct dcesrv_interface *iface, const st
 		}
 	}
 
-	return False;	
+	return false;	
 }
 
-static BOOL remote_op_interface_by_name(struct dcesrv_interface *iface, const char *name)
+static bool remote_op_interface_by_name(struct dcesrv_interface *iface, const char *name)
 {
 	const struct ndr_interface_table *tbl = ndr_table_by_name(name);
 
 	if (tbl)
 		return remote_fill_interface(iface, tbl);
 
-	return False;	
+	return false;	
 }
 
 NTSTATUS dcerpc_server_remote_init(void)
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index e3cb70ad17..28816c03f8 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -143,7 +143,7 @@ NTSTATUS dcesrv_samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALL
 	status = samdb_set_password(sam_ctx, mem_ctx,
 				    a_state->account_dn, a_state->domain_state->domain_dn,
 				    msg, NULL, &new_lmPwdHash, &new_ntPwdHash, 
-				    True, /* this is a user password change */
+				    true, /* this is a user password change */
 				    NULL,
 				    NULL);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -278,7 +278,7 @@ NTSTATUS dcesrv_samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call,
 				    user_dn, NULL, 
 				    mod, new_pass, 
 				    NULL, NULL,
-				    True, /* this is a user password change */
+				    true, /* this is a user password change */
 				    NULL, 
 				    NULL);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -431,7 +431,7 @@ NTSTATUS dcesrv_samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call,
 				    user_dn, NULL, 
 				    mod, new_pass, 
 				    NULL, NULL,
-				    True, /* this is a user password change */
+				    true, /* this is a user password change */
 				    &reason, 
 				    &dominfo);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -539,7 +539,7 @@ NTSTATUS samr_set_password(struct dcesrv_call_state *dce_call,
 				  account_dn, domain_dn, 
 				  msg, new_pass, 
 				  NULL, NULL,
-				  False, /* This is a password set, not change */
+				  false, /* This is a password set, not change */
 				  NULL, NULL);
 }
 
@@ -592,7 +592,7 @@ NTSTATUS samr_set_password_ex(struct dcesrv_call_state *dce_call,
 				  account_dn, domain_dn, 
 				  msg, new_pass, 
 				  NULL, NULL,
-				  False, /* This is a password set, not change */
+				  false, /* This is a password set, not change */
 				  NULL, NULL);
 }
 
diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 802c8b6df8..04dd5a8ee9 100644
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -173,9 +173,9 @@ static void dcesrv_sock_recv(struct stream_connection *conn, uint16_t flags)
 
 	tmp_blob.length = nread;
 
-	dce_conn->processing = True;
+	dce_conn->processing = true;
 	status = dcesrv_input(dce_conn, &tmp_blob);
-	dce_conn->processing = False;
+	dce_conn->processing = false;
 	talloc_free(tmp_blob.data);
 
 	EVENT_FD_READABLE(conn->event.fde);
diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c
index 3d7a5319ca..09409b1514 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -149,7 +149,7 @@ static WERROR dcesrv_spoolss_check_server_name(struct dcesrv_call_state *dce_cal
 					TALLOC_CTX *mem_ctx,
 					const char *server_name)
 {
-	BOOL ret;
+	bool ret;
 	struct socket_address *myaddr;
 	const char **aliases;
 	int i;