RIP BOOL. Convert BOOL -> bool. I found a few interesting

bugs in various places whilst doing this (places that assumed
BOOL == int). I also need to fix the Samba4 pidl generation
(next checkin).
Jeremy.
(This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)

15 files changed, 372 insertions, 372 deletions

diff --git a/source3/librpc/gen_ndr/srv_dfs.c b/source3/librpc/gen_ndr/srv_dfs.c
index 82cb5c8d9a..596449badc 100644
--- a/source3/librpc/gen_ndr/srv_dfs.c
+++ b/source3/librpc/gen_ndr/srv_dfs.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_dfs.h"
 
-static BOOL api_dfs_GetManagerVersion(pipes_struct *p)
+static bool api_dfs_GetManagerVersion(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -84,7 +84,7 @@ static BOOL api_dfs_GetManagerVersion(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_Add(pipes_struct *p)
+static bool api_dfs_Add(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -155,7 +155,7 @@ static BOOL api_dfs_Add(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_Remove(pipes_struct *p)
+static bool api_dfs_Remove(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -226,7 +226,7 @@ static BOOL api_dfs_Remove(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_SetInfo(pipes_struct *p)
+static bool api_dfs_SetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -297,7 +297,7 @@ static BOOL api_dfs_SetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_GetInfo(pipes_struct *p)
+static bool api_dfs_GetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -375,7 +375,7 @@ static BOOL api_dfs_GetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_Enum(pipes_struct *p)
+static bool api_dfs_Enum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -449,7 +449,7 @@ static BOOL api_dfs_Enum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_Rename(pipes_struct *p)
+static bool api_dfs_Rename(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -520,7 +520,7 @@ static BOOL api_dfs_Rename(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_Move(pipes_struct *p)
+static bool api_dfs_Move(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -591,7 +591,7 @@ static BOOL api_dfs_Move(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_ManagerGetConfigInfo(pipes_struct *p)
+static bool api_dfs_ManagerGetConfigInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -662,7 +662,7 @@ static BOOL api_dfs_ManagerGetConfigInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_ManagerSendSiteInfo(pipes_struct *p)
+static bool api_dfs_ManagerSendSiteInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -733,7 +733,7 @@ static BOOL api_dfs_ManagerSendSiteInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_AddFtRoot(pipes_struct *p)
+static bool api_dfs_AddFtRoot(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -806,7 +806,7 @@ static BOOL api_dfs_AddFtRoot(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_RemoveFtRoot(pipes_struct *p)
+static bool api_dfs_RemoveFtRoot(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -879,7 +879,7 @@ static BOOL api_dfs_RemoveFtRoot(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_AddStdRoot(pipes_struct *p)
+static bool api_dfs_AddStdRoot(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -950,7 +950,7 @@ static BOOL api_dfs_AddStdRoot(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_RemoveStdRoot(pipes_struct *p)
+static bool api_dfs_RemoveStdRoot(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1021,7 +1021,7 @@ static BOOL api_dfs_RemoveStdRoot(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_ManagerInitialize(pipes_struct *p)
+static bool api_dfs_ManagerInitialize(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1092,7 +1092,7 @@ static BOOL api_dfs_ManagerInitialize(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_AddStdRootForced(pipes_struct *p)
+static bool api_dfs_AddStdRootForced(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1163,7 +1163,7 @@ static BOOL api_dfs_AddStdRootForced(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_GetDcAddress(pipes_struct *p)
+static bool api_dfs_GetDcAddress(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1234,7 +1234,7 @@ static BOOL api_dfs_GetDcAddress(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_SetDcAddress(pipes_struct *p)
+static bool api_dfs_SetDcAddress(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1305,7 +1305,7 @@ static BOOL api_dfs_SetDcAddress(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_FlushFtTable(pipes_struct *p)
+static bool api_dfs_FlushFtTable(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1376,7 +1376,7 @@ static BOOL api_dfs_FlushFtTable(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_Add2(pipes_struct *p)
+static bool api_dfs_Add2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1447,7 +1447,7 @@ static BOOL api_dfs_Add2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_Remove2(pipes_struct *p)
+static bool api_dfs_Remove2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1518,7 +1518,7 @@ static BOOL api_dfs_Remove2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_EnumEx(pipes_struct *p)
+static bool api_dfs_EnumEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1592,7 +1592,7 @@ static BOOL api_dfs_EnumEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_dfs_SetInfo2(pipes_struct *p)
+static bool api_dfs_SetInfo2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_echo.c b/source3/librpc/gen_ndr/srv_echo.c
index e5315ba9f7..558988e14b 100644
--- a/source3/librpc/gen_ndr/srv_echo.c
+++ b/source3/librpc/gen_ndr/srv_echo.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_echo.h"
 
-static BOOL api_echo_AddOne(pipes_struct *p)
+static bool api_echo_AddOne(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -84,7 +84,7 @@ static BOOL api_echo_AddOne(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_EchoData(pipes_struct *p)
+static bool api_echo_EchoData(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -162,7 +162,7 @@ static BOOL api_echo_EchoData(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_SinkData(pipes_struct *p)
+static bool api_echo_SinkData(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -233,7 +233,7 @@ static BOOL api_echo_SinkData(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_SourceData(pipes_struct *p)
+static bool api_echo_SourceData(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -311,7 +311,7 @@ static BOOL api_echo_SourceData(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_TestCall(pipes_struct *p)
+static bool api_echo_TestCall(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -389,7 +389,7 @@ static BOOL api_echo_TestCall(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_TestCall2(pipes_struct *p)
+static bool api_echo_TestCall2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -467,7 +467,7 @@ static BOOL api_echo_TestCall2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_TestSleep(pipes_struct *p)
+static bool api_echo_TestSleep(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -538,7 +538,7 @@ static BOOL api_echo_TestSleep(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_TestEnum(pipes_struct *p)
+static bool api_echo_TestEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -613,7 +613,7 @@ static BOOL api_echo_TestEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_TestSurrounding(pipes_struct *p)
+static bool api_echo_TestSurrounding(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -686,7 +686,7 @@ static BOOL api_echo_TestSurrounding(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_echo_TestDoublePointer(pipes_struct *p)
+static bool api_echo_TestDoublePointer(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_epmapper.c b/source3/librpc/gen_ndr/srv_epmapper.c
index 36c55b6890..d458dd4180 100644
--- a/source3/librpc/gen_ndr/srv_epmapper.c
+++ b/source3/librpc/gen_ndr/srv_epmapper.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_epmapper.h"
 
-static BOOL api_epm_Insert(pipes_struct *p)
+static bool api_epm_Insert(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -77,7 +77,7 @@ static BOOL api_epm_Insert(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_epm_Delete(pipes_struct *p)
+static bool api_epm_Delete(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -148,7 +148,7 @@ static BOOL api_epm_Delete(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_epm_Lookup(pipes_struct *p)
+static bool api_epm_Lookup(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -233,7 +233,7 @@ static BOOL api_epm_Lookup(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_epm_Map(pipes_struct *p)
+static bool api_epm_Map(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -318,7 +318,7 @@ static BOOL api_epm_Map(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_epm_LookupHandleFree(pipes_struct *p)
+static bool api_epm_LookupHandleFree(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -391,7 +391,7 @@ static BOOL api_epm_LookupHandleFree(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_epm_InqObject(pipes_struct *p)
+static bool api_epm_InqObject(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -462,7 +462,7 @@ static BOOL api_epm_InqObject(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_epm_MgmtDelete(pipes_struct *p)
+static bool api_epm_MgmtDelete(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -533,7 +533,7 @@ static BOOL api_epm_MgmtDelete(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_epm_MapAuth(pipes_struct *p)
+static bool api_epm_MapAuth(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_eventlog.c b/source3/librpc/gen_ndr/srv_eventlog.c
index d58753511a..13810d4d74 100644
--- a/source3/librpc/gen_ndr/srv_eventlog.c
+++ b/source3/librpc/gen_ndr/srv_eventlog.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_eventlog.h"
 
-static BOOL api_eventlog_ClearEventLogW(pipes_struct *p)
+static bool api_eventlog_ClearEventLogW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -77,7 +77,7 @@ static BOOL api_eventlog_ClearEventLogW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_BackupEventLogW(pipes_struct *p)
+static bool api_eventlog_BackupEventLogW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -148,7 +148,7 @@ static BOOL api_eventlog_BackupEventLogW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_CloseEventLog(pipes_struct *p)
+static bool api_eventlog_CloseEventLog(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -221,7 +221,7 @@ static BOOL api_eventlog_CloseEventLog(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_DeregisterEventSource(pipes_struct *p)
+static bool api_eventlog_DeregisterEventSource(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -292,7 +292,7 @@ static BOOL api_eventlog_DeregisterEventSource(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_GetNumRecords(pipes_struct *p)
+static bool api_eventlog_GetNumRecords(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -370,7 +370,7 @@ static BOOL api_eventlog_GetNumRecords(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_GetOldestRecord(pipes_struct *p)
+static bool api_eventlog_GetOldestRecord(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -441,7 +441,7 @@ static BOOL api_eventlog_GetOldestRecord(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_ChangeNotify(pipes_struct *p)
+static bool api_eventlog_ChangeNotify(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -512,7 +512,7 @@ static BOOL api_eventlog_ChangeNotify(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_OpenEventLogW(pipes_struct *p)
+static bool api_eventlog_OpenEventLogW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -590,7 +590,7 @@ static BOOL api_eventlog_OpenEventLogW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_RegisterEventSourceW(pipes_struct *p)
+static bool api_eventlog_RegisterEventSourceW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -661,7 +661,7 @@ static BOOL api_eventlog_RegisterEventSourceW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_OpenBackupEventLogW(pipes_struct *p)
+static bool api_eventlog_OpenBackupEventLogW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -732,7 +732,7 @@ static BOOL api_eventlog_OpenBackupEventLogW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_ReadEventLogW(pipes_struct *p)
+static bool api_eventlog_ReadEventLogW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -822,7 +822,7 @@ static BOOL api_eventlog_ReadEventLogW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_ReportEventW(pipes_struct *p)
+static bool api_eventlog_ReportEventW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -893,7 +893,7 @@ static BOOL api_eventlog_ReportEventW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_ClearEventLogA(pipes_struct *p)
+static bool api_eventlog_ClearEventLogA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -964,7 +964,7 @@ static BOOL api_eventlog_ClearEventLogA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_BackupEventLogA(pipes_struct *p)
+static bool api_eventlog_BackupEventLogA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1035,7 +1035,7 @@ static BOOL api_eventlog_BackupEventLogA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_OpenEventLogA(pipes_struct *p)
+static bool api_eventlog_OpenEventLogA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1106,7 +1106,7 @@ static BOOL api_eventlog_OpenEventLogA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_RegisterEventSourceA(pipes_struct *p)
+static bool api_eventlog_RegisterEventSourceA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1177,7 +1177,7 @@ static BOOL api_eventlog_RegisterEventSourceA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_OpenBackupEventLogA(pipes_struct *p)
+static bool api_eventlog_OpenBackupEventLogA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1248,7 +1248,7 @@ static BOOL api_eventlog_OpenBackupEventLogA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_ReadEventLogA(pipes_struct *p)
+static bool api_eventlog_ReadEventLogA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1319,7 +1319,7 @@ static BOOL api_eventlog_ReadEventLogA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_ReportEventA(pipes_struct *p)
+static bool api_eventlog_ReportEventA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1390,7 +1390,7 @@ static BOOL api_eventlog_ReportEventA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_RegisterClusterSvc(pipes_struct *p)
+static bool api_eventlog_RegisterClusterSvc(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1461,7 +1461,7 @@ static BOOL api_eventlog_RegisterClusterSvc(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_DeregisterClusterSvc(pipes_struct *p)
+static bool api_eventlog_DeregisterClusterSvc(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1532,7 +1532,7 @@ static BOOL api_eventlog_DeregisterClusterSvc(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_WriteClusterEvents(pipes_struct *p)
+static bool api_eventlog_WriteClusterEvents(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1603,7 +1603,7 @@ static BOOL api_eventlog_WriteClusterEvents(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_GetLogIntormation(pipes_struct *p)
+static bool api_eventlog_GetLogIntormation(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1674,7 +1674,7 @@ static BOOL api_eventlog_GetLogIntormation(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_eventlog_FlushEventLog(pipes_struct *p)
+static bool api_eventlog_FlushEventLog(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_initshutdown.c b/source3/librpc/gen_ndr/srv_initshutdown.c
index 3a7ce728ce..9b20bd7115 100644
--- a/source3/librpc/gen_ndr/srv_initshutdown.c
+++ b/source3/librpc/gen_ndr/srv_initshutdown.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_initshutdown.h"
 
-static BOOL api_initshutdown_Init(pipes_struct *p)
+static bool api_initshutdown_Init(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -77,7 +77,7 @@ static BOOL api_initshutdown_Init(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_initshutdown_Abort(pipes_struct *p)
+static bool api_initshutdown_Abort(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -148,7 +148,7 @@ static BOOL api_initshutdown_Abort(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_initshutdown_InitEx(pipes_struct *p)
+static bool api_initshutdown_InitEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_lsa.c b/source3/librpc/gen_ndr/srv_lsa.c
index d528d7bb0c..fef909e3ec 100644
--- a/source3/librpc/gen_ndr/srv_lsa.c
+++ b/source3/librpc/gen_ndr/srv_lsa.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_lsa.h"
 
-static BOOL api_lsa_Close(pipes_struct *p)
+static bool api_lsa_Close(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -79,7 +79,7 @@ static BOOL api_lsa_Close(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_Delete(pipes_struct *p)
+static bool api_lsa_Delete(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -150,7 +150,7 @@ static BOOL api_lsa_Delete(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_EnumPrivs(pipes_struct *p)
+static bool api_lsa_EnumPrivs(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -229,7 +229,7 @@ static BOOL api_lsa_EnumPrivs(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_QuerySecurity(pipes_struct *p)
+static bool api_lsa_QuerySecurity(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -307,7 +307,7 @@ static BOOL api_lsa_QuerySecurity(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetSecObj(pipes_struct *p)
+static bool api_lsa_SetSecObj(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -378,7 +378,7 @@ static BOOL api_lsa_SetSecObj(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_ChangePassword(pipes_struct *p)
+static bool api_lsa_ChangePassword(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -449,7 +449,7 @@ static BOOL api_lsa_ChangePassword(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_OpenPolicy(pipes_struct *p)
+static bool api_lsa_OpenPolicy(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -527,7 +527,7 @@ static BOOL api_lsa_OpenPolicy(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_QueryInfoPolicy(pipes_struct *p)
+static bool api_lsa_QueryInfoPolicy(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -605,7 +605,7 @@ static BOOL api_lsa_QueryInfoPolicy(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetInfoPolicy(pipes_struct *p)
+static bool api_lsa_SetInfoPolicy(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -676,7 +676,7 @@ static BOOL api_lsa_SetInfoPolicy(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_ClearAuditLog(pipes_struct *p)
+static bool api_lsa_ClearAuditLog(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -747,7 +747,7 @@ static BOOL api_lsa_ClearAuditLog(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CreateAccount(pipes_struct *p)
+static bool api_lsa_CreateAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -825,7 +825,7 @@ static BOOL api_lsa_CreateAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_EnumAccounts(pipes_struct *p)
+static bool api_lsa_EnumAccounts(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -904,7 +904,7 @@ static BOOL api_lsa_EnumAccounts(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CreateTrustedDomain(pipes_struct *p)
+static bool api_lsa_CreateTrustedDomain(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -982,7 +982,7 @@ static BOOL api_lsa_CreateTrustedDomain(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_EnumTrustDom(pipes_struct *p)
+static bool api_lsa_EnumTrustDom(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1061,7 +1061,7 @@ static BOOL api_lsa_EnumTrustDom(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupNames(pipes_struct *p)
+static bool api_lsa_LookupNames(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1141,7 +1141,7 @@ static BOOL api_lsa_LookupNames(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupSids(pipes_struct *p)
+static bool api_lsa_LookupSids(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1221,7 +1221,7 @@ static BOOL api_lsa_LookupSids(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CreateSecret(pipes_struct *p)
+static bool api_lsa_CreateSecret(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1299,7 +1299,7 @@ static BOOL api_lsa_CreateSecret(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_OpenAccount(pipes_struct *p)
+static bool api_lsa_OpenAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1377,7 +1377,7 @@ static BOOL api_lsa_OpenAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_EnumPrivsAccount(pipes_struct *p)
+static bool api_lsa_EnumPrivsAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1455,7 +1455,7 @@ static BOOL api_lsa_EnumPrivsAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_AddPrivilegesToAccount(pipes_struct *p)
+static bool api_lsa_AddPrivilegesToAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1526,7 +1526,7 @@ static BOOL api_lsa_AddPrivilegesToAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_RemovePrivilegesFromAccount(pipes_struct *p)
+static bool api_lsa_RemovePrivilegesFromAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1597,7 +1597,7 @@ static BOOL api_lsa_RemovePrivilegesFromAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_GetQuotasForAccount(pipes_struct *p)
+static bool api_lsa_GetQuotasForAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1668,7 +1668,7 @@ static BOOL api_lsa_GetQuotasForAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetQuotasForAccount(pipes_struct *p)
+static bool api_lsa_SetQuotasForAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1739,7 +1739,7 @@ static BOOL api_lsa_SetQuotasForAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_GetSystemAccessAccount(pipes_struct *p)
+static bool api_lsa_GetSystemAccessAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1810,7 +1810,7 @@ static BOOL api_lsa_GetSystemAccessAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetSystemAccessAccount(pipes_struct *p)
+static bool api_lsa_SetSystemAccessAccount(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1881,7 +1881,7 @@ static BOOL api_lsa_SetSystemAccessAccount(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_OpenTrustedDomain(pipes_struct *p)
+static bool api_lsa_OpenTrustedDomain(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1959,7 +1959,7 @@ static BOOL api_lsa_OpenTrustedDomain(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_QueryTrustedDomainInfo(pipes_struct *p)
+static bool api_lsa_QueryTrustedDomainInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2037,7 +2037,7 @@ static BOOL api_lsa_QueryTrustedDomainInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetInformationTrustedDomain(pipes_struct *p)
+static bool api_lsa_SetInformationTrustedDomain(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2108,7 +2108,7 @@ static BOOL api_lsa_SetInformationTrustedDomain(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_OpenSecret(pipes_struct *p)
+static bool api_lsa_OpenSecret(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2186,7 +2186,7 @@ static BOOL api_lsa_OpenSecret(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetSecret(pipes_struct *p)
+static bool api_lsa_SetSecret(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2257,7 +2257,7 @@ static BOOL api_lsa_SetSecret(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_QuerySecret(pipes_struct *p)
+static bool api_lsa_QuerySecret(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2333,7 +2333,7 @@ static BOOL api_lsa_QuerySecret(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupPrivValue(pipes_struct *p)
+static bool api_lsa_LookupPrivValue(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2411,7 +2411,7 @@ static BOOL api_lsa_LookupPrivValue(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupPrivName(pipes_struct *p)
+static bool api_lsa_LookupPrivName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2489,7 +2489,7 @@ static BOOL api_lsa_LookupPrivName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupPrivDisplayName(pipes_struct *p)
+static bool api_lsa_LookupPrivDisplayName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2568,7 +2568,7 @@ static BOOL api_lsa_LookupPrivDisplayName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_DeleteObject(pipes_struct *p)
+static bool api_lsa_DeleteObject(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2639,7 +2639,7 @@ static BOOL api_lsa_DeleteObject(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_EnumAccountsWithUserRight(pipes_struct *p)
+static bool api_lsa_EnumAccountsWithUserRight(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2717,7 +2717,7 @@ static BOOL api_lsa_EnumAccountsWithUserRight(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_EnumAccountRights(pipes_struct *p)
+static bool api_lsa_EnumAccountRights(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2795,7 +2795,7 @@ static BOOL api_lsa_EnumAccountRights(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_AddAccountRights(pipes_struct *p)
+static bool api_lsa_AddAccountRights(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2866,7 +2866,7 @@ static BOOL api_lsa_AddAccountRights(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_RemoveAccountRights(pipes_struct *p)
+static bool api_lsa_RemoveAccountRights(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2937,7 +2937,7 @@ static BOOL api_lsa_RemoveAccountRights(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_QueryTrustedDomainInfoBySid(pipes_struct *p)
+static bool api_lsa_QueryTrustedDomainInfoBySid(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3015,7 +3015,7 @@ static BOOL api_lsa_QueryTrustedDomainInfoBySid(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetTrustedDomainInfo(pipes_struct *p)
+static bool api_lsa_SetTrustedDomainInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3086,7 +3086,7 @@ static BOOL api_lsa_SetTrustedDomainInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_DeleteTrustedDomain(pipes_struct *p)
+static bool api_lsa_DeleteTrustedDomain(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3157,7 +3157,7 @@ static BOOL api_lsa_DeleteTrustedDomain(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_StorePrivateData(pipes_struct *p)
+static bool api_lsa_StorePrivateData(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3228,7 +3228,7 @@ static BOOL api_lsa_StorePrivateData(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_RetrievePrivateData(pipes_struct *p)
+static bool api_lsa_RetrievePrivateData(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3299,7 +3299,7 @@ static BOOL api_lsa_RetrievePrivateData(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_OpenPolicy2(pipes_struct *p)
+static bool api_lsa_OpenPolicy2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3377,7 +3377,7 @@ static BOOL api_lsa_OpenPolicy2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_GetUserName(pipes_struct *p)
+static bool api_lsa_GetUserName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3451,7 +3451,7 @@ static BOOL api_lsa_GetUserName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_QueryInfoPolicy2(pipes_struct *p)
+static bool api_lsa_QueryInfoPolicy2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3529,7 +3529,7 @@ static BOOL api_lsa_QueryInfoPolicy2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetInfoPolicy2(pipes_struct *p)
+static bool api_lsa_SetInfoPolicy2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3600,7 +3600,7 @@ static BOOL api_lsa_SetInfoPolicy2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_QueryTrustedDomainInfoByName(pipes_struct *p)
+static bool api_lsa_QueryTrustedDomainInfoByName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3678,7 +3678,7 @@ static BOOL api_lsa_QueryTrustedDomainInfoByName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetTrustedDomainInfoByName(pipes_struct *p)
+static bool api_lsa_SetTrustedDomainInfoByName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3749,7 +3749,7 @@ static BOOL api_lsa_SetTrustedDomainInfoByName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_EnumTrustedDomainsEx(pipes_struct *p)
+static bool api_lsa_EnumTrustedDomainsEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3828,7 +3828,7 @@ static BOOL api_lsa_EnumTrustedDomainsEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CreateTrustedDomainEx(pipes_struct *p)
+static bool api_lsa_CreateTrustedDomainEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3899,7 +3899,7 @@ static BOOL api_lsa_CreateTrustedDomainEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CloseTrustedDomainEx(pipes_struct *p)
+static bool api_lsa_CloseTrustedDomainEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3972,7 +3972,7 @@ static BOOL api_lsa_CloseTrustedDomainEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_QueryDomainInformationPolicy(pipes_struct *p)
+static bool api_lsa_QueryDomainInformationPolicy(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4050,7 +4050,7 @@ static BOOL api_lsa_QueryDomainInformationPolicy(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_SetDomainInformationPolicy(pipes_struct *p)
+static bool api_lsa_SetDomainInformationPolicy(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4121,7 +4121,7 @@ static BOOL api_lsa_SetDomainInformationPolicy(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_OpenTrustedDomainByName(pipes_struct *p)
+static bool api_lsa_OpenTrustedDomainByName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4199,7 +4199,7 @@ static BOOL api_lsa_OpenTrustedDomainByName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_TestCall(pipes_struct *p)
+static bool api_lsa_TestCall(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4270,7 +4270,7 @@ static BOOL api_lsa_TestCall(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupSids2(pipes_struct *p)
+static bool api_lsa_LookupSids2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4350,7 +4350,7 @@ static BOOL api_lsa_LookupSids2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupNames2(pipes_struct *p)
+static bool api_lsa_LookupNames2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4430,7 +4430,7 @@ static BOOL api_lsa_LookupNames2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CreateTrustedDomainEx2(pipes_struct *p)
+static bool api_lsa_CreateTrustedDomainEx2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4501,7 +4501,7 @@ static BOOL api_lsa_CreateTrustedDomainEx2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRWRITE(pipes_struct *p)
+static bool api_lsa_CREDRWRITE(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4572,7 +4572,7 @@ static BOOL api_lsa_CREDRWRITE(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRREAD(pipes_struct *p)
+static bool api_lsa_CREDRREAD(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4643,7 +4643,7 @@ static BOOL api_lsa_CREDRREAD(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRENUMERATE(pipes_struct *p)
+static bool api_lsa_CREDRENUMERATE(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4714,7 +4714,7 @@ static BOOL api_lsa_CREDRENUMERATE(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRWRITEDOMAINCREDENTIALS(pipes_struct *p)
+static bool api_lsa_CREDRWRITEDOMAINCREDENTIALS(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4785,7 +4785,7 @@ static BOOL api_lsa_CREDRWRITEDOMAINCREDENTIALS(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRREADDOMAINCREDENTIALS(pipes_struct *p)
+static bool api_lsa_CREDRREADDOMAINCREDENTIALS(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4856,7 +4856,7 @@ static BOOL api_lsa_CREDRREADDOMAINCREDENTIALS(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRDELETE(pipes_struct *p)
+static bool api_lsa_CREDRDELETE(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4927,7 +4927,7 @@ static BOOL api_lsa_CREDRDELETE(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRGETTARGETINFO(pipes_struct *p)
+static bool api_lsa_CREDRGETTARGETINFO(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -4998,7 +4998,7 @@ static BOOL api_lsa_CREDRGETTARGETINFO(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRPROFILELOADED(pipes_struct *p)
+static bool api_lsa_CREDRPROFILELOADED(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5069,7 +5069,7 @@ static BOOL api_lsa_CREDRPROFILELOADED(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupNames3(pipes_struct *p)
+static bool api_lsa_LookupNames3(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5149,7 +5149,7 @@ static BOOL api_lsa_LookupNames3(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRGETSESSIONTYPES(pipes_struct *p)
+static bool api_lsa_CREDRGETSESSIONTYPES(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5220,7 +5220,7 @@ static BOOL api_lsa_CREDRGETSESSIONTYPES(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSARREGISTERAUDITEVENT(pipes_struct *p)
+static bool api_lsa_LSARREGISTERAUDITEVENT(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5291,7 +5291,7 @@ static BOOL api_lsa_LSARREGISTERAUDITEVENT(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSARGENAUDITEVENT(pipes_struct *p)
+static bool api_lsa_LSARGENAUDITEVENT(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5362,7 +5362,7 @@ static BOOL api_lsa_LSARGENAUDITEVENT(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSARUNREGISTERAUDITEVENT(pipes_struct *p)
+static bool api_lsa_LSARUNREGISTERAUDITEVENT(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5433,7 +5433,7 @@ static BOOL api_lsa_LSARUNREGISTERAUDITEVENT(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSARQUERYFORESTTRUSTINFORMATION(pipes_struct *p)
+static bool api_lsa_LSARQUERYFORESTTRUSTINFORMATION(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5504,7 +5504,7 @@ static BOOL api_lsa_LSARQUERYFORESTTRUSTINFORMATION(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSARSETFORESTTRUSTINFORMATION(pipes_struct *p)
+static bool api_lsa_LSARSETFORESTTRUSTINFORMATION(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5575,7 +5575,7 @@ static BOOL api_lsa_LSARSETFORESTTRUSTINFORMATION(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_CREDRRENAME(pipes_struct *p)
+static bool api_lsa_CREDRRENAME(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5646,7 +5646,7 @@ static BOOL api_lsa_CREDRRENAME(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupSids3(pipes_struct *p)
+static bool api_lsa_LookupSids3(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5726,7 +5726,7 @@ static BOOL api_lsa_LookupSids3(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LookupNames4(pipes_struct *p)
+static bool api_lsa_LookupNames4(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5806,7 +5806,7 @@ static BOOL api_lsa_LookupNames4(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSAROPENPOLICYSCE(pipes_struct *p)
+static bool api_lsa_LSAROPENPOLICYSCE(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5877,7 +5877,7 @@ static BOOL api_lsa_LSAROPENPOLICYSCE(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
+static bool api_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -5948,7 +5948,7 @@ static BOOL api_lsa_LSARADTREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
+static bool api_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -6019,7 +6019,7 @@ static BOOL api_lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_lsa_LSARADTREPORTSECURITYEVENT(pipes_struct *p)
+static bool api_lsa_LSARADTREPORTSECURITYEVENT(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_netlogon.c b/source3/librpc/gen_ndr/srv_netlogon.c
index a372d7f5d9..37e6ac73d1 100644
--- a/source3/librpc/gen_ndr/srv_netlogon.c
+++ b/source3/librpc/gen_ndr/srv_netlogon.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_netlogon.h"
 
-static BOOL api_netr_LogonUasLogon(pipes_struct *p)
+static bool api_netr_LogonUasLogon(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -84,7 +84,7 @@ static BOOL api_netr_LogonUasLogon(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonUasLogoff(pipes_struct *p)
+static bool api_netr_LogonUasLogoff(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -162,7 +162,7 @@ static BOOL api_netr_LogonUasLogoff(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonSamLogon(pipes_struct *p)
+static bool api_netr_LogonSamLogon(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -247,7 +247,7 @@ static BOOL api_netr_LogonSamLogon(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonSamLogoff(pipes_struct *p)
+static bool api_netr_LogonSamLogoff(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -320,7 +320,7 @@ static BOOL api_netr_LogonSamLogoff(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_ServerReqChallenge(pipes_struct *p)
+static bool api_netr_ServerReqChallenge(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -393,7 +393,7 @@ static BOOL api_netr_ServerReqChallenge(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_ServerAuthenticate(pipes_struct *p)
+static bool api_netr_ServerAuthenticate(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -466,7 +466,7 @@ static BOOL api_netr_ServerAuthenticate(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_ServerPasswordSet(pipes_struct *p)
+static bool api_netr_ServerPasswordSet(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -544,7 +544,7 @@ static BOOL api_netr_ServerPasswordSet(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DatabaseDeltas(pipes_struct *p)
+static bool api_netr_DatabaseDeltas(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -624,7 +624,7 @@ static BOOL api_netr_DatabaseDeltas(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DatabaseSync(pipes_struct *p)
+static bool api_netr_DatabaseSync(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -704,7 +704,7 @@ static BOOL api_netr_DatabaseSync(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_AccountDeltas(pipes_struct *p)
+static bool api_netr_AccountDeltas(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -801,7 +801,7 @@ static BOOL api_netr_AccountDeltas(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_AccountSync(pipes_struct *p)
+static bool api_netr_AccountSync(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -899,7 +899,7 @@ static BOOL api_netr_AccountSync(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_GetDcName(pipes_struct *p)
+static bool api_netr_GetDcName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -977,7 +977,7 @@ static BOOL api_netr_GetDcName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonControl(pipes_struct *p)
+static bool api_netr_LogonControl(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1055,7 +1055,7 @@ static BOOL api_netr_LogonControl(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_GetAnyDCName(pipes_struct *p)
+static bool api_netr_GetAnyDCName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1133,7 +1133,7 @@ static BOOL api_netr_GetAnyDCName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonControl2(pipes_struct *p)
+static bool api_netr_LogonControl2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1211,7 +1211,7 @@ static BOOL api_netr_LogonControl2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_ServerAuthenticate2(pipes_struct *p)
+static bool api_netr_ServerAuthenticate2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1285,7 +1285,7 @@ static BOOL api_netr_ServerAuthenticate2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DatabaseSync2(pipes_struct *p)
+static bool api_netr_DatabaseSync2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1365,7 +1365,7 @@ static BOOL api_netr_DatabaseSync2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DatabaseRedo(pipes_struct *p)
+static bool api_netr_DatabaseRedo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1444,7 +1444,7 @@ static BOOL api_netr_DatabaseRedo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonControl2Ex(pipes_struct *p)
+static bool api_netr_LogonControl2Ex(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1522,7 +1522,7 @@ static BOOL api_netr_LogonControl2Ex(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRENUMERATETRUSTEDDOMAINS(pipes_struct *p)
+static bool api_netr_NETRENUMERATETRUSTEDDOMAINS(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1593,7 +1593,7 @@ static BOOL api_netr_NETRENUMERATETRUSTEDDOMAINS(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DsRGetDCName(pipes_struct *p)
+static bool api_netr_DsRGetDCName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1671,7 +1671,7 @@ static BOOL api_netr_DsRGetDCName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRLOGONDUMMYROUTINE1(pipes_struct *p)
+static bool api_netr_NETRLOGONDUMMYROUTINE1(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1742,7 +1742,7 @@ static BOOL api_netr_NETRLOGONDUMMYROUTINE1(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRLOGONSETSERVICEBITS(pipes_struct *p)
+static bool api_netr_NETRLOGONSETSERVICEBITS(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1813,7 +1813,7 @@ static BOOL api_netr_NETRLOGONSETSERVICEBITS(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRLOGONGETTRUSTRID(pipes_struct *p)
+static bool api_netr_NETRLOGONGETTRUSTRID(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1884,7 +1884,7 @@ static BOOL api_netr_NETRLOGONGETTRUSTRID(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRLOGONCOMPUTESERVERDIGEST(pipes_struct *p)
+static bool api_netr_NETRLOGONCOMPUTESERVERDIGEST(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1955,7 +1955,7 @@ static BOOL api_netr_NETRLOGONCOMPUTESERVERDIGEST(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRLOGONCOMPUTECLIENTDIGEST(pipes_struct *p)
+static bool api_netr_NETRLOGONCOMPUTECLIENTDIGEST(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2026,7 +2026,7 @@ static BOOL api_netr_NETRLOGONCOMPUTECLIENTDIGEST(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_ServerAuthenticate3(pipes_struct *p)
+static bool api_netr_ServerAuthenticate3(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2106,7 +2106,7 @@ static BOOL api_netr_ServerAuthenticate3(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DsRGetDCNameEx(pipes_struct *p)
+static bool api_netr_DsRGetDCNameEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2184,7 +2184,7 @@ static BOOL api_netr_DsRGetDCNameEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DsRGetSiteName(pipes_struct *p)
+static bool api_netr_DsRGetSiteName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2262,7 +2262,7 @@ static BOOL api_netr_DsRGetSiteName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonGetDomainInfo(pipes_struct *p)
+static bool api_netr_LogonGetDomainInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2341,7 +2341,7 @@ static BOOL api_netr_LogonGetDomainInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_ServerPasswordSet2(pipes_struct *p)
+static bool api_netr_ServerPasswordSet2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2419,7 +2419,7 @@ static BOOL api_netr_ServerPasswordSet2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRSERVERPASSWORDGET(pipes_struct *p)
+static bool api_netr_NETRSERVERPASSWORDGET(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2490,7 +2490,7 @@ static BOOL api_netr_NETRSERVERPASSWORDGET(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRLOGONSENDTOSAM(pipes_struct *p)
+static bool api_netr_NETRLOGONSENDTOSAM(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2561,7 +2561,7 @@ static BOOL api_netr_NETRLOGONSENDTOSAM(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DSRADDRESSTOSITENAMESW(pipes_struct *p)
+static bool api_netr_DSRADDRESSTOSITENAMESW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2632,7 +2632,7 @@ static BOOL api_netr_DSRADDRESSTOSITENAMESW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DsRGetDCNameEx2(pipes_struct *p)
+static bool api_netr_DsRGetDCNameEx2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2710,7 +2710,7 @@ static BOOL api_netr_DsRGetDCNameEx2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(pipes_struct *p)
+static bool api_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2781,7 +2781,7 @@ static BOOL api_netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRENUMERATETRUSTEDDOMAINSEX(pipes_struct *p)
+static bool api_netr_NETRENUMERATETRUSTEDDOMAINSEX(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2852,7 +2852,7 @@ static BOOL api_netr_NETRENUMERATETRUSTEDDOMAINSEX(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DSRADDRESSTOSITENAMESEXW(pipes_struct *p)
+static bool api_netr_DSRADDRESSTOSITENAMESEXW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2923,7 +2923,7 @@ static BOOL api_netr_DSRADDRESSTOSITENAMESEXW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DSRGETDCSITECOVERAGEW(pipes_struct *p)
+static bool api_netr_DSRGETDCSITECOVERAGEW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2994,7 +2994,7 @@ static BOOL api_netr_DSRGETDCSITECOVERAGEW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonSamLogonEx(pipes_struct *p)
+static bool api_netr_LogonSamLogonEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3079,7 +3079,7 @@ static BOOL api_netr_LogonSamLogonEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DsrEnumerateDomainTrusts(pipes_struct *p)
+static bool api_netr_DsrEnumerateDomainTrusts(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3163,7 +3163,7 @@ static BOOL api_netr_DsrEnumerateDomainTrusts(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DSRDEREGISTERDNSHOSTRECORDS(pipes_struct *p)
+static bool api_netr_DSRDEREGISTERDNSHOSTRECORDS(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3234,7 +3234,7 @@ static BOOL api_netr_DSRDEREGISTERDNSHOSTRECORDS(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRSERVERTRUSTPASSWORDSGET(pipes_struct *p)
+static bool api_netr_NETRSERVERTRUSTPASSWORDSGET(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3305,7 +3305,7 @@ static BOOL api_netr_NETRSERVERTRUSTPASSWORDSGET(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_DSRGETFORESTTRUSTINFORMATION(pipes_struct *p)
+static bool api_netr_DSRGETFORESTTRUSTINFORMATION(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3376,7 +3376,7 @@ static BOOL api_netr_DSRGETFORESTTRUSTINFORMATION(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRGETFORESTTRUSTINFORMATION(pipes_struct *p)
+static bool api_netr_NETRGETFORESTTRUSTINFORMATION(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3447,7 +3447,7 @@ static BOOL api_netr_NETRGETFORESTTRUSTINFORMATION(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_LogonSamLogonWithFlags(pipes_struct *p)
+static bool api_netr_LogonSamLogonWithFlags(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3533,7 +3533,7 @@ static BOOL api_netr_LogonSamLogonWithFlags(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_netr_NETRSERVERGETTRUSTINFO(pipes_struct *p)
+static bool api_netr_NETRSERVERGETTRUSTINFO(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_srvsvc.c b/source3/librpc/gen_ndr/srv_srvsvc.c
index 88ca7fdc64..7402f981fb 100644
--- a/source3/librpc/gen_ndr/srv_srvsvc.c
+++ b/source3/librpc/gen_ndr/srv_srvsvc.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_srvsvc.h"
 
-static BOOL api_srvsvc_NetCharDevEnum(pipes_struct *p)
+static bool api_srvsvc_NetCharDevEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -87,7 +87,7 @@ static BOOL api_srvsvc_NetCharDevEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetCharDevGetInfo(pipes_struct *p)
+static bool api_srvsvc_NetCharDevGetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -165,7 +165,7 @@ static BOOL api_srvsvc_NetCharDevGetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetCharDevControl(pipes_struct *p)
+static bool api_srvsvc_NetCharDevControl(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -236,7 +236,7 @@ static BOOL api_srvsvc_NetCharDevControl(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetCharDevQEnum(pipes_struct *p)
+static bool api_srvsvc_NetCharDevQEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -317,7 +317,7 @@ static BOOL api_srvsvc_NetCharDevQEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetCharDevQGetInfo(pipes_struct *p)
+static bool api_srvsvc_NetCharDevQGetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -395,7 +395,7 @@ static BOOL api_srvsvc_NetCharDevQGetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetCharDevQSetInfo(pipes_struct *p)
+static bool api_srvsvc_NetCharDevQSetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -468,7 +468,7 @@ static BOOL api_srvsvc_NetCharDevQSetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetCharDevQPurge(pipes_struct *p)
+static bool api_srvsvc_NetCharDevQPurge(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -539,7 +539,7 @@ static BOOL api_srvsvc_NetCharDevQPurge(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetCharDevQPurgeSelf(pipes_struct *p)
+static bool api_srvsvc_NetCharDevQPurgeSelf(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -610,7 +610,7 @@ static BOOL api_srvsvc_NetCharDevQPurgeSelf(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetConnEnum(pipes_struct *p)
+static bool api_srvsvc_NetConnEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -691,7 +691,7 @@ static BOOL api_srvsvc_NetConnEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetFileEnum(pipes_struct *p)
+static bool api_srvsvc_NetFileEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -772,7 +772,7 @@ static BOOL api_srvsvc_NetFileEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetFileGetInfo(pipes_struct *p)
+static bool api_srvsvc_NetFileGetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -850,7 +850,7 @@ static BOOL api_srvsvc_NetFileGetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetFileClose(pipes_struct *p)
+static bool api_srvsvc_NetFileClose(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -921,7 +921,7 @@ static BOOL api_srvsvc_NetFileClose(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetSessEnum(pipes_struct *p)
+static bool api_srvsvc_NetSessEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1002,7 +1002,7 @@ static BOOL api_srvsvc_NetSessEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetSessDel(pipes_struct *p)
+static bool api_srvsvc_NetSessDel(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1073,7 +1073,7 @@ static BOOL api_srvsvc_NetSessDel(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareAdd(pipes_struct *p)
+static bool api_srvsvc_NetShareAdd(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1146,7 +1146,7 @@ static BOOL api_srvsvc_NetShareAdd(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareEnumAll(pipes_struct *p)
+static bool api_srvsvc_NetShareEnumAll(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1227,7 +1227,7 @@ static BOOL api_srvsvc_NetShareEnumAll(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareGetInfo(pipes_struct *p)
+static bool api_srvsvc_NetShareGetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1305,7 +1305,7 @@ static BOOL api_srvsvc_NetShareGetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareSetInfo(pipes_struct *p)
+static bool api_srvsvc_NetShareSetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1378,7 +1378,7 @@ static BOOL api_srvsvc_NetShareSetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareDel(pipes_struct *p)
+static bool api_srvsvc_NetShareDel(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1449,7 +1449,7 @@ static BOOL api_srvsvc_NetShareDel(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareDelSticky(pipes_struct *p)
+static bool api_srvsvc_NetShareDelSticky(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1520,7 +1520,7 @@ static BOOL api_srvsvc_NetShareDelSticky(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareCheck(pipes_struct *p)
+static bool api_srvsvc_NetShareCheck(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1598,7 +1598,7 @@ static BOOL api_srvsvc_NetShareCheck(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetSrvGetInfo(pipes_struct *p)
+static bool api_srvsvc_NetSrvGetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1676,7 +1676,7 @@ static BOOL api_srvsvc_NetSrvGetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetSrvSetInfo(pipes_struct *p)
+static bool api_srvsvc_NetSrvSetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1749,7 +1749,7 @@ static BOOL api_srvsvc_NetSrvSetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetDiskEnum(pipes_struct *p)
+static bool api_srvsvc_NetDiskEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1829,7 +1829,7 @@ static BOOL api_srvsvc_NetDiskEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetServerStatisticsGet(pipes_struct *p)
+static bool api_srvsvc_NetServerStatisticsGet(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1907,7 +1907,7 @@ static BOOL api_srvsvc_NetServerStatisticsGet(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetTransportAdd(pipes_struct *p)
+static bool api_srvsvc_NetTransportAdd(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1978,7 +1978,7 @@ static BOOL api_srvsvc_NetTransportAdd(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetTransportEnum(pipes_struct *p)
+static bool api_srvsvc_NetTransportEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2059,7 +2059,7 @@ static BOOL api_srvsvc_NetTransportEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetTransportDel(pipes_struct *p)
+static bool api_srvsvc_NetTransportDel(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2130,7 +2130,7 @@ static BOOL api_srvsvc_NetTransportDel(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetRemoteTOD(pipes_struct *p)
+static bool api_srvsvc_NetRemoteTOD(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2208,7 +2208,7 @@ static BOOL api_srvsvc_NetRemoteTOD(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetSetServiceBits(pipes_struct *p)
+static bool api_srvsvc_NetSetServiceBits(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2279,7 +2279,7 @@ static BOOL api_srvsvc_NetSetServiceBits(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetPathType(pipes_struct *p)
+static bool api_srvsvc_NetPathType(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2357,7 +2357,7 @@ static BOOL api_srvsvc_NetPathType(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetPathCanonicalize(pipes_struct *p)
+static bool api_srvsvc_NetPathCanonicalize(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2436,7 +2436,7 @@ static BOOL api_srvsvc_NetPathCanonicalize(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetPathCompare(pipes_struct *p)
+static bool api_srvsvc_NetPathCompare(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2507,7 +2507,7 @@ static BOOL api_srvsvc_NetPathCompare(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetNameValidate(pipes_struct *p)
+static bool api_srvsvc_NetNameValidate(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2578,7 +2578,7 @@ static BOOL api_srvsvc_NetNameValidate(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRPRNAMECANONICALIZE(pipes_struct *p)
+static bool api_srvsvc_NETRPRNAMECANONICALIZE(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2649,7 +2649,7 @@ static BOOL api_srvsvc_NETRPRNAMECANONICALIZE(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetPRNameCompare(pipes_struct *p)
+static bool api_srvsvc_NetPRNameCompare(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2720,7 +2720,7 @@ static BOOL api_srvsvc_NetPRNameCompare(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareEnum(pipes_struct *p)
+static bool api_srvsvc_NetShareEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2801,7 +2801,7 @@ static BOOL api_srvsvc_NetShareEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareDelStart(pipes_struct *p)
+static bool api_srvsvc_NetShareDelStart(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2879,7 +2879,7 @@ static BOOL api_srvsvc_NetShareDelStart(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetShareDelCommit(pipes_struct *p)
+static bool api_srvsvc_NetShareDelCommit(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2952,7 +2952,7 @@ static BOOL api_srvsvc_NetShareDelCommit(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetGetFileSecurity(pipes_struct *p)
+static bool api_srvsvc_NetGetFileSecurity(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3030,7 +3030,7 @@ static BOOL api_srvsvc_NetGetFileSecurity(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetSetFileSecurity(pipes_struct *p)
+static bool api_srvsvc_NetSetFileSecurity(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3101,7 +3101,7 @@ static BOOL api_srvsvc_NetSetFileSecurity(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetServerTransportAddEx(pipes_struct *p)
+static bool api_srvsvc_NetServerTransportAddEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3172,7 +3172,7 @@ static BOOL api_srvsvc_NetServerTransportAddEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NetServerSetServiceBitsEx(pipes_struct *p)
+static bool api_srvsvc_NetServerSetServiceBitsEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3243,7 +3243,7 @@ static BOOL api_srvsvc_NetServerSetServiceBitsEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSGETVERSION(pipes_struct *p)
+static bool api_srvsvc_NETRDFSGETVERSION(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3314,7 +3314,7 @@ static BOOL api_srvsvc_NETRDFSGETVERSION(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSCREATELOCALPARTITION(pipes_struct *p)
+static bool api_srvsvc_NETRDFSCREATELOCALPARTITION(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3385,7 +3385,7 @@ static BOOL api_srvsvc_NETRDFSCREATELOCALPARTITION(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSDELETELOCALPARTITION(pipes_struct *p)
+static bool api_srvsvc_NETRDFSDELETELOCALPARTITION(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3456,7 +3456,7 @@ static BOOL api_srvsvc_NETRDFSDELETELOCALPARTITION(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSSETLOCALVOLUMESTATE(pipes_struct *p)
+static bool api_srvsvc_NETRDFSSETLOCALVOLUMESTATE(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3527,7 +3527,7 @@ static BOOL api_srvsvc_NETRDFSSETLOCALVOLUMESTATE(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSSETSERVERINFO(pipes_struct *p)
+static bool api_srvsvc_NETRDFSSETSERVERINFO(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3598,7 +3598,7 @@ static BOOL api_srvsvc_NETRDFSSETSERVERINFO(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSCREATEEXITPOINT(pipes_struct *p)
+static bool api_srvsvc_NETRDFSCREATEEXITPOINT(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3669,7 +3669,7 @@ static BOOL api_srvsvc_NETRDFSCREATEEXITPOINT(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSDELETEEXITPOINT(pipes_struct *p)
+static bool api_srvsvc_NETRDFSDELETEEXITPOINT(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3740,7 +3740,7 @@ static BOOL api_srvsvc_NETRDFSDELETEEXITPOINT(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSMODIFYPREFIX(pipes_struct *p)
+static bool api_srvsvc_NETRDFSMODIFYPREFIX(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3811,7 +3811,7 @@ static BOOL api_srvsvc_NETRDFSMODIFYPREFIX(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSFIXLOCALVOLUME(pipes_struct *p)
+static bool api_srvsvc_NETRDFSFIXLOCALVOLUME(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3882,7 +3882,7 @@ static BOOL api_srvsvc_NETRDFSFIXLOCALVOLUME(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRDFSMANAGERREPORTSITEINFO(pipes_struct *p)
+static bool api_srvsvc_NETRDFSMANAGERREPORTSITEINFO(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3953,7 +3953,7 @@ static BOOL api_srvsvc_NETRDFSMANAGERREPORTSITEINFO(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_srvsvc_NETRSERVERTRANSPORTDELEX(pipes_struct *p)
+static bool api_srvsvc_NETRSERVERTRANSPORTDELEX(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_svcctl.c b/source3/librpc/gen_ndr/srv_svcctl.c
index 05dd27e7d8..5f66b8853c 100644
--- a/source3/librpc/gen_ndr/srv_svcctl.c
+++ b/source3/librpc/gen_ndr/srv_svcctl.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_svcctl.h"
 
-static BOOL api_svcctl_CloseServiceHandle(pipes_struct *p)
+static bool api_svcctl_CloseServiceHandle(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -79,7 +79,7 @@ static BOOL api_svcctl_CloseServiceHandle(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_ControlService(pipes_struct *p)
+static bool api_svcctl_ControlService(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -157,7 +157,7 @@ static BOOL api_svcctl_ControlService(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_DeleteService(pipes_struct *p)
+static bool api_svcctl_DeleteService(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -228,7 +228,7 @@ static BOOL api_svcctl_DeleteService(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_LockServiceDatabase(pipes_struct *p)
+static bool api_svcctl_LockServiceDatabase(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -306,7 +306,7 @@ static BOOL api_svcctl_LockServiceDatabase(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceObjectSecurity(pipes_struct *p)
+static bool api_svcctl_QueryServiceObjectSecurity(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -377,7 +377,7 @@ static BOOL api_svcctl_QueryServiceObjectSecurity(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_SetServiceObjectSecurity(pipes_struct *p)
+static bool api_svcctl_SetServiceObjectSecurity(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -448,7 +448,7 @@ static BOOL api_svcctl_SetServiceObjectSecurity(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceStatus(pipes_struct *p)
+static bool api_svcctl_QueryServiceStatus(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -526,7 +526,7 @@ static BOOL api_svcctl_QueryServiceStatus(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_SetServiceStatus(pipes_struct *p)
+static bool api_svcctl_SetServiceStatus(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -597,7 +597,7 @@ static BOOL api_svcctl_SetServiceStatus(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_UnlockServiceDatabase(pipes_struct *p)
+static bool api_svcctl_UnlockServiceDatabase(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -670,7 +670,7 @@ static BOOL api_svcctl_UnlockServiceDatabase(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_NotifyBootConfigStatus(pipes_struct *p)
+static bool api_svcctl_NotifyBootConfigStatus(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -741,7 +741,7 @@ static BOOL api_svcctl_NotifyBootConfigStatus(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_SCSetServiceBitsW(pipes_struct *p)
+static bool api_svcctl_SCSetServiceBitsW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -812,7 +812,7 @@ static BOOL api_svcctl_SCSetServiceBitsW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_ChangeServiceConfigW(pipes_struct *p)
+static bool api_svcctl_ChangeServiceConfigW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -890,7 +890,7 @@ static BOOL api_svcctl_ChangeServiceConfigW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_CreateServiceW(pipes_struct *p)
+static bool api_svcctl_CreateServiceW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -969,7 +969,7 @@ static BOOL api_svcctl_CreateServiceW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_EnumDependentServicesW(pipes_struct *p)
+static bool api_svcctl_EnumDependentServicesW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1059,7 +1059,7 @@ static BOOL api_svcctl_EnumDependentServicesW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_EnumServicesStatusW(pipes_struct *p)
+static bool api_svcctl_EnumServicesStatusW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1150,7 +1150,7 @@ static BOOL api_svcctl_EnumServicesStatusW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_OpenSCManagerW(pipes_struct *p)
+static bool api_svcctl_OpenSCManagerW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1228,7 +1228,7 @@ static BOOL api_svcctl_OpenSCManagerW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_OpenServiceW(pipes_struct *p)
+static bool api_svcctl_OpenServiceW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1306,7 +1306,7 @@ static BOOL api_svcctl_OpenServiceW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceConfigW(pipes_struct *p)
+static bool api_svcctl_QueryServiceConfigW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1390,7 +1390,7 @@ static BOOL api_svcctl_QueryServiceConfigW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceLockStatusW(pipes_struct *p)
+static bool api_svcctl_QueryServiceLockStatusW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1474,7 +1474,7 @@ static BOOL api_svcctl_QueryServiceLockStatusW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_StartServiceW(pipes_struct *p)
+static bool api_svcctl_StartServiceW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1545,7 +1545,7 @@ static BOOL api_svcctl_StartServiceW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_GetServiceDisplayNameW(pipes_struct *p)
+static bool api_svcctl_GetServiceDisplayNameW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1624,7 +1624,7 @@ static BOOL api_svcctl_GetServiceDisplayNameW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_GetServiceKeyNameW(pipes_struct *p)
+static bool api_svcctl_GetServiceKeyNameW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1703,7 +1703,7 @@ static BOOL api_svcctl_GetServiceKeyNameW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_SCSetServiceBitsA(pipes_struct *p)
+static bool api_svcctl_SCSetServiceBitsA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1774,7 +1774,7 @@ static BOOL api_svcctl_SCSetServiceBitsA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_ChangeServiceConfigA(pipes_struct *p)
+static bool api_svcctl_ChangeServiceConfigA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1852,7 +1852,7 @@ static BOOL api_svcctl_ChangeServiceConfigA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_CreateServiceA(pipes_struct *p)
+static bool api_svcctl_CreateServiceA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1930,7 +1930,7 @@ static BOOL api_svcctl_CreateServiceA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_EnumDependentServicesA(pipes_struct *p)
+static bool api_svcctl_EnumDependentServicesA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2020,7 +2020,7 @@ static BOOL api_svcctl_EnumDependentServicesA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_EnumServicesStatusA(pipes_struct *p)
+static bool api_svcctl_EnumServicesStatusA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2111,7 +2111,7 @@ static BOOL api_svcctl_EnumServicesStatusA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_OpenSCManagerA(pipes_struct *p)
+static bool api_svcctl_OpenSCManagerA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2189,7 +2189,7 @@ static BOOL api_svcctl_OpenSCManagerA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_OpenServiceA(pipes_struct *p)
+static bool api_svcctl_OpenServiceA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2260,7 +2260,7 @@ static BOOL api_svcctl_OpenServiceA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceConfigA(pipes_struct *p)
+static bool api_svcctl_QueryServiceConfigA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2344,7 +2344,7 @@ static BOOL api_svcctl_QueryServiceConfigA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceLockStatusA(pipes_struct *p)
+static bool api_svcctl_QueryServiceLockStatusA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2428,7 +2428,7 @@ static BOOL api_svcctl_QueryServiceLockStatusA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_StartServiceA(pipes_struct *p)
+static bool api_svcctl_StartServiceA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2499,7 +2499,7 @@ static BOOL api_svcctl_StartServiceA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_GetServiceDisplayNameA(pipes_struct *p)
+static bool api_svcctl_GetServiceDisplayNameA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2578,7 +2578,7 @@ static BOOL api_svcctl_GetServiceDisplayNameA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_GetServiceKeyNameA(pipes_struct *p)
+static bool api_svcctl_GetServiceKeyNameA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2657,7 +2657,7 @@ static BOOL api_svcctl_GetServiceKeyNameA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_GetCurrentGroupeStateW(pipes_struct *p)
+static bool api_svcctl_GetCurrentGroupeStateW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2728,7 +2728,7 @@ static BOOL api_svcctl_GetCurrentGroupeStateW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_EnumServiceGroupW(pipes_struct *p)
+static bool api_svcctl_EnumServiceGroupW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2799,7 +2799,7 @@ static BOOL api_svcctl_EnumServiceGroupW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_ChangeServiceConfig2A(pipes_struct *p)
+static bool api_svcctl_ChangeServiceConfig2A(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2870,7 +2870,7 @@ static BOOL api_svcctl_ChangeServiceConfig2A(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_ChangeServiceConfig2W(pipes_struct *p)
+static bool api_svcctl_ChangeServiceConfig2W(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2941,7 +2941,7 @@ static BOOL api_svcctl_ChangeServiceConfig2W(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceConfig2A(pipes_struct *p)
+static bool api_svcctl_QueryServiceConfig2A(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3025,7 +3025,7 @@ static BOOL api_svcctl_QueryServiceConfig2A(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceConfig2W(pipes_struct *p)
+static bool api_svcctl_QueryServiceConfig2W(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3109,7 +3109,7 @@ static BOOL api_svcctl_QueryServiceConfig2W(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_QueryServiceStatusEx(pipes_struct *p)
+static bool api_svcctl_QueryServiceStatusEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3193,7 +3193,7 @@ static BOOL api_svcctl_QueryServiceStatusEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_EnumServicesStatusExA(pipes_struct *p)
+static bool api_EnumServicesStatusExA(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3290,7 +3290,7 @@ static BOOL api_EnumServicesStatusExA(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_EnumServicesStatusExW(pipes_struct *p)
+static bool api_EnumServicesStatusExW(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -3387,7 +3387,7 @@ static BOOL api_EnumServicesStatusExW(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_svcctl_SCSendTSMessage(pipes_struct *p)
+static bool api_svcctl_SCSendTSMessage(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_unixinfo.c b/source3/librpc/gen_ndr/srv_unixinfo.c
index 6566ff35e4..a034068b8d 100644
--- a/source3/librpc/gen_ndr/srv_unixinfo.c
+++ b/source3/librpc/gen_ndr/srv_unixinfo.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_unixinfo.h"
 
-static BOOL api_unixinfo_SidToUid(pipes_struct *p)
+static bool api_unixinfo_SidToUid(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -84,7 +84,7 @@ static BOOL api_unixinfo_SidToUid(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_unixinfo_UidToSid(pipes_struct *p)
+static bool api_unixinfo_UidToSid(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -162,7 +162,7 @@ static BOOL api_unixinfo_UidToSid(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_unixinfo_SidToGid(pipes_struct *p)
+static bool api_unixinfo_SidToGid(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -240,7 +240,7 @@ static BOOL api_unixinfo_SidToGid(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_unixinfo_GidToSid(pipes_struct *p)
+static bool api_unixinfo_GidToSid(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -318,7 +318,7 @@ static BOOL api_unixinfo_GidToSid(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_unixinfo_GetPWUid(pipes_struct *p)
+static bool api_unixinfo_GetPWUid(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_winreg.c b/source3/librpc/gen_ndr/srv_winreg.c
index c947de4837..86b5305644 100644
--- a/source3/librpc/gen_ndr/srv_winreg.c
+++ b/source3/librpc/gen_ndr/srv_winreg.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_winreg.h"
 
-static BOOL api_winreg_OpenHKCR(pipes_struct *p)
+static bool api_winreg_OpenHKCR(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -84,7 +84,7 @@ static BOOL api_winreg_OpenHKCR(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenHKCU(pipes_struct *p)
+static bool api_winreg_OpenHKCU(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -162,7 +162,7 @@ static BOOL api_winreg_OpenHKCU(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenHKLM(pipes_struct *p)
+static bool api_winreg_OpenHKLM(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -240,7 +240,7 @@ static BOOL api_winreg_OpenHKLM(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenHKPD(pipes_struct *p)
+static bool api_winreg_OpenHKPD(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -318,7 +318,7 @@ static BOOL api_winreg_OpenHKPD(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenHKU(pipes_struct *p)
+static bool api_winreg_OpenHKU(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -396,7 +396,7 @@ static BOOL api_winreg_OpenHKU(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_CloseKey(pipes_struct *p)
+static bool api_winreg_CloseKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -469,7 +469,7 @@ static BOOL api_winreg_CloseKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_CreateKey(pipes_struct *p)
+static bool api_winreg_CreateKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -548,7 +548,7 @@ static BOOL api_winreg_CreateKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_DeleteKey(pipes_struct *p)
+static bool api_winreg_DeleteKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -619,7 +619,7 @@ static BOOL api_winreg_DeleteKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_DeleteValue(pipes_struct *p)
+static bool api_winreg_DeleteValue(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -690,7 +690,7 @@ static BOOL api_winreg_DeleteValue(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_EnumKey(pipes_struct *p)
+static bool api_winreg_EnumKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -765,7 +765,7 @@ static BOOL api_winreg_EnumKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_EnumValue(pipes_struct *p)
+static bool api_winreg_EnumValue(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -842,7 +842,7 @@ static BOOL api_winreg_EnumValue(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_FlushKey(pipes_struct *p)
+static bool api_winreg_FlushKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -913,7 +913,7 @@ static BOOL api_winreg_FlushKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_GetKeySecurity(pipes_struct *p)
+static bool api_winreg_GetKeySecurity(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -986,7 +986,7 @@ static BOOL api_winreg_GetKeySecurity(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_LoadKey(pipes_struct *p)
+static bool api_winreg_LoadKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1057,7 +1057,7 @@ static BOOL api_winreg_LoadKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_NotifyChangeKeyValue(pipes_struct *p)
+static bool api_winreg_NotifyChangeKeyValue(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1128,7 +1128,7 @@ static BOOL api_winreg_NotifyChangeKeyValue(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenKey(pipes_struct *p)
+static bool api_winreg_OpenKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1206,7 +1206,7 @@ static BOOL api_winreg_OpenKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_QueryInfoKey(pipes_struct *p)
+static bool api_winreg_QueryInfoKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1327,7 +1327,7 @@ static BOOL api_winreg_QueryInfoKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_QueryValue(pipes_struct *p)
+static bool api_winreg_QueryValue(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1403,7 +1403,7 @@ static BOOL api_winreg_QueryValue(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_ReplaceKey(pipes_struct *p)
+static bool api_winreg_ReplaceKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1474,7 +1474,7 @@ static BOOL api_winreg_ReplaceKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_RestoreKey(pipes_struct *p)
+static bool api_winreg_RestoreKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1545,7 +1545,7 @@ static BOOL api_winreg_RestoreKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_SaveKey(pipes_struct *p)
+static bool api_winreg_SaveKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1616,7 +1616,7 @@ static BOOL api_winreg_SaveKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_SetKeySecurity(pipes_struct *p)
+static bool api_winreg_SetKeySecurity(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1687,7 +1687,7 @@ static BOOL api_winreg_SetKeySecurity(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_SetValue(pipes_struct *p)
+static bool api_winreg_SetValue(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1758,7 +1758,7 @@ static BOOL api_winreg_SetValue(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_UnLoadKey(pipes_struct *p)
+static bool api_winreg_UnLoadKey(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1829,7 +1829,7 @@ static BOOL api_winreg_UnLoadKey(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_InitiateSystemShutdown(pipes_struct *p)
+static bool api_winreg_InitiateSystemShutdown(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1900,7 +1900,7 @@ static BOOL api_winreg_InitiateSystemShutdown(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_AbortSystemShutdown(pipes_struct *p)
+static bool api_winreg_AbortSystemShutdown(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1971,7 +1971,7 @@ static BOOL api_winreg_AbortSystemShutdown(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_GetVersion(pipes_struct *p)
+static bool api_winreg_GetVersion(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2049,7 +2049,7 @@ static BOOL api_winreg_GetVersion(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenHKCC(pipes_struct *p)
+static bool api_winreg_OpenHKCC(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2127,7 +2127,7 @@ static BOOL api_winreg_OpenHKCC(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenHKDD(pipes_struct *p)
+static bool api_winreg_OpenHKDD(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2205,7 +2205,7 @@ static BOOL api_winreg_OpenHKDD(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_QueryMultipleValues(pipes_struct *p)
+static bool api_winreg_QueryMultipleValues(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2280,7 +2280,7 @@ static BOOL api_winreg_QueryMultipleValues(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_InitiateSystemShutdownEx(pipes_struct *p)
+static bool api_winreg_InitiateSystemShutdownEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2351,7 +2351,7 @@ static BOOL api_winreg_InitiateSystemShutdownEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_SaveKeyEx(pipes_struct *p)
+static bool api_winreg_SaveKeyEx(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2422,7 +2422,7 @@ static BOOL api_winreg_SaveKeyEx(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenHKPT(pipes_struct *p)
+static bool api_winreg_OpenHKPT(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2500,7 +2500,7 @@ static BOOL api_winreg_OpenHKPT(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_OpenHKPN(pipes_struct *p)
+static bool api_winreg_OpenHKPN(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2578,7 +2578,7 @@ static BOOL api_winreg_OpenHKPN(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_winreg_QueryMultipleValues2(pipes_struct *p)
+static bool api_winreg_QueryMultipleValues2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/gen_ndr/srv_wkssvc.c b/source3/librpc/gen_ndr/srv_wkssvc.c
index a542aee7f0..d327252b9d 100644
--- a/source3/librpc/gen_ndr/srv_wkssvc.c
+++ b/source3/librpc/gen_ndr/srv_wkssvc.c
@@ -6,7 +6,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/srv_wkssvc.h"
 
-static BOOL api_wkssvc_NetWkstaGetInfo(pipes_struct *p)
+static bool api_wkssvc_NetWkstaGetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -84,7 +84,7 @@ static BOOL api_wkssvc_NetWkstaGetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_wkssvc_NetWkstaSetInfo(pipes_struct *p)
+static bool api_wkssvc_NetWkstaSetInfo(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -157,7 +157,7 @@ static BOOL api_wkssvc_NetWkstaSetInfo(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_wkssvc_NetWkstaEnumUsers(pipes_struct *p)
+static bool api_wkssvc_NetWkstaEnumUsers(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -243,7 +243,7 @@ static BOOL api_wkssvc_NetWkstaEnumUsers(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRWKSTAUSERGETINFO(pipes_struct *p)
+static bool api_WKSSVC_NETRWKSTAUSERGETINFO(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -314,7 +314,7 @@ static BOOL api_WKSSVC_NETRWKSTAUSERGETINFO(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRWKSTAUSERSETINFO(pipes_struct *p)
+static bool api_WKSSVC_NETRWKSTAUSERSETINFO(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -385,7 +385,7 @@ static BOOL api_WKSSVC_NETRWKSTAUSERSETINFO(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_wkssvc_NetWkstaTransportEnum(pipes_struct *p)
+static bool api_wkssvc_NetWkstaTransportEnum(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -466,7 +466,7 @@ static BOOL api_wkssvc_NetWkstaTransportEnum(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRWKSTATRANSPORTADD(pipes_struct *p)
+static bool api_WKSSVC_NETRWKSTATRANSPORTADD(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -537,7 +537,7 @@ static BOOL api_WKSSVC_NETRWKSTATRANSPORTADD(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRWKSTATRANSPORTDEL(pipes_struct *p)
+static bool api_WKSSVC_NETRWKSTATRANSPORTDEL(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -608,7 +608,7 @@ static BOOL api_WKSSVC_NETRWKSTATRANSPORTDEL(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRUSEADD(pipes_struct *p)
+static bool api_WKSSVC_NETRUSEADD(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -679,7 +679,7 @@ static BOOL api_WKSSVC_NETRUSEADD(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRUSEGETINFO(pipes_struct *p)
+static bool api_WKSSVC_NETRUSEGETINFO(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -750,7 +750,7 @@ static BOOL api_WKSSVC_NETRUSEGETINFO(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRUSEDEL(pipes_struct *p)
+static bool api_WKSSVC_NETRUSEDEL(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -821,7 +821,7 @@ static BOOL api_WKSSVC_NETRUSEDEL(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRUSEENUM(pipes_struct *p)
+static bool api_WKSSVC_NETRUSEENUM(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -892,7 +892,7 @@ static BOOL api_WKSSVC_NETRUSEENUM(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRMESSAGEBUFFERSEND(pipes_struct *p)
+static bool api_WKSSVC_NETRMESSAGEBUFFERSEND(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -963,7 +963,7 @@ static BOOL api_WKSSVC_NETRMESSAGEBUFFERSEND(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRWORKSTATIONSTATISTICSGET(pipes_struct *p)
+static bool api_WKSSVC_NETRWORKSTATIONSTATISTICSGET(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1034,7 +1034,7 @@ static BOOL api_WKSSVC_NETRWORKSTATIONSTATISTICSGET(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRLOGONDOMAINNAMEADD(pipes_struct *p)
+static bool api_WKSSVC_NETRLOGONDOMAINNAMEADD(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1105,7 +1105,7 @@ static BOOL api_WKSSVC_NETRLOGONDOMAINNAMEADD(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRLOGONDOMAINNAMEDEL(pipes_struct *p)
+static bool api_WKSSVC_NETRLOGONDOMAINNAMEDEL(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1176,7 +1176,7 @@ static BOOL api_WKSSVC_NETRLOGONDOMAINNAMEDEL(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRJOINDOMAIN(pipes_struct *p)
+static bool api_WKSSVC_NETRJOINDOMAIN(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1247,7 +1247,7 @@ static BOOL api_WKSSVC_NETRJOINDOMAIN(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRUNJOINDOMAIN(pipes_struct *p)
+static bool api_WKSSVC_NETRUNJOINDOMAIN(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1318,7 +1318,7 @@ static BOOL api_WKSSVC_NETRUNJOINDOMAIN(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRRENAMEMACHINEINDOMAIN(pipes_struct *p)
+static bool api_WKSSVC_NETRRENAMEMACHINEINDOMAIN(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1389,7 +1389,7 @@ static BOOL api_WKSSVC_NETRRENAMEMACHINEINDOMAIN(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRVALIDATENAME(pipes_struct *p)
+static bool api_WKSSVC_NETRVALIDATENAME(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1460,7 +1460,7 @@ static BOOL api_WKSSVC_NETRVALIDATENAME(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRGETJOININFORMATION(pipes_struct *p)
+static bool api_WKSSVC_NETRGETJOININFORMATION(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1531,7 +1531,7 @@ static BOOL api_WKSSVC_NETRGETJOININFORMATION(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRGETJOINABLEOUS(pipes_struct *p)
+static bool api_WKSSVC_NETRGETJOINABLEOUS(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1602,7 +1602,7 @@ static BOOL api_WKSSVC_NETRGETJOINABLEOUS(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_wkssvc_NetrJoinDomain2(pipes_struct *p)
+static bool api_wkssvc_NetrJoinDomain2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1673,7 +1673,7 @@ static BOOL api_wkssvc_NetrJoinDomain2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_wkssvc_NetrUnjoinDomain2(pipes_struct *p)
+static bool api_wkssvc_NetrUnjoinDomain2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1744,7 +1744,7 @@ static BOOL api_wkssvc_NetrUnjoinDomain2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_wkssvc_NetrRenameMachineInDomain2(pipes_struct *p)
+static bool api_wkssvc_NetrRenameMachineInDomain2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1815,7 +1815,7 @@ static BOOL api_wkssvc_NetrRenameMachineInDomain2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRVALIDATENAME2(pipes_struct *p)
+static bool api_WKSSVC_NETRVALIDATENAME2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1886,7 +1886,7 @@ static BOOL api_WKSSVC_NETRVALIDATENAME2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRGETJOINABLEOUS2(pipes_struct *p)
+static bool api_WKSSVC_NETRGETJOINABLEOUS2(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -1957,7 +1957,7 @@ static BOOL api_WKSSVC_NETRGETJOINABLEOUS2(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_wkssvc_NetrAddAlternateComputerName(pipes_struct *p)
+static bool api_wkssvc_NetrAddAlternateComputerName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2028,7 +2028,7 @@ static BOOL api_wkssvc_NetrAddAlternateComputerName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_wkssvc_NetrRemoveAlternateComputerName(pipes_struct *p)
+static bool api_wkssvc_NetrRemoveAlternateComputerName(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2099,7 +2099,7 @@ static BOOL api_wkssvc_NetrRemoveAlternateComputerName(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRSETPRIMARYCOMPUTERNAME(pipes_struct *p)
+static bool api_WKSSVC_NETRSETPRIMARYCOMPUTERNAME(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
@@ -2170,7 +2170,7 @@ static BOOL api_WKSSVC_NETRSETPRIMARYCOMPUTERNAME(pipes_struct *p)
 	return True;
 }
 
-static BOOL api_WKSSVC_NETRENUMERATECOMPUTERNAMES(pipes_struct *p)
+static bool api_WKSSVC_NETRENUMERATECOMPUTERNAMES(pipes_struct *p)
 {
 	const struct ndr_interface_call *call;
 	struct ndr_pull *pull;
diff --git a/source3/librpc/ndr/libndr.h b/source3/librpc/ndr/libndr.h
index adf2c94e4a..4531293c7b 100644
--- a/source3/librpc/ndr/libndr.h
+++ b/source3/librpc/ndr/libndr.h
@@ -293,7 +293,7 @@ struct ndr_interface_call {
         ndr_push_flags_fn_t ndr_push;
         ndr_pull_flags_fn_t ndr_pull;
         ndr_print_function_t ndr_print;
-        BOOL async;
+        bool async;
 };
 
 struct ndr_interface_string_array {
diff --git a/source3/librpc/ndr/ndr.c b/source3/librpc/ndr/ndr.c
index e2b660dc2c..552545999b 100644
--- a/source3/librpc/ndr/ndr.c
+++ b/source3/librpc/ndr/ndr.c
@@ -535,7 +535,7 @@ NTSTATUS ndr_token_store(TALLOC_CTX *mem_ctx,
   retrieve a token from a ndr context, using cmp_fn to match the tokens
 */
 NTSTATUS ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v,
-				   comparison_fn_t _cmp_fn, BOOL _remove_tok)
+				   comparison_fn_t _cmp_fn, bool _remove_tok)
 {
 	struct ndr_token_list *tok;
 	for (tok=*list;tok;tok=tok->next) {
diff --git a/source3/librpc/ndr/ndr_misc.c b/source3/librpc/ndr/ndr_misc.c
index e66a8b9a5d..e4bff83650 100644
--- a/source3/librpc/ndr/ndr_misc.c
+++ b/source3/librpc/ndr/ndr_misc.c
@@ -133,7 +133,7 @@ struct GUID GUID_zero(void)
  * see if a range of memory is all zero. A NULL pointer is considered
  * to be all zero 
  */
-BOOL all_zero(const uint8_t *ptr, size_t size)
+bool all_zero(const uint8_t *ptr, size_t size)
 {
 	int i;
 	if (!ptr) return True;
@@ -144,7 +144,7 @@ BOOL all_zero(const uint8_t *ptr, size_t size)
 }
 
 
-BOOL GUID_all_zero(const struct GUID *u)
+bool GUID_all_zero(const struct GUID *u)
 {
 	if (u->time_low != 0 ||
 	    u->time_mid != 0 ||
@@ -157,7 +157,7 @@ BOOL GUID_all_zero(const struct GUID *u)
 	return True;
 }
 
-BOOL GUID_equal(const struct GUID *u1, const struct GUID *u2)
+bool GUID_equal(const struct GUID *u1, const struct GUID *u2)
 {
 	if (u1->time_low != u2->time_low ||
 	    u1->time_mid != u2->time_mid ||
@@ -199,7 +199,7 @@ void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *
 	ndr->print(ndr, "%-25s: %s", name, GUID_string(ndr, guid));
 }
 
-BOOL policy_handle_empty(struct policy_handle *h) 
+bool policy_handle_empty(struct policy_handle *h) 
 {
 	return (h->handle_type == 0 && GUID_all_zero(&h->uuid));
 }