Use True, not TRUE and False, not FALSE

(This used to be commit 44e9bf88cc2bbb2aa34711354258c3abb319cb9b)

5 files changed, 8 insertions, 8 deletions

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 42310b41b0..b146951561 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -31,7 +31,7 @@ static void lazy_initialize_passdb(void)
 	static BOOL initialized = FALSE;
 	if(initialized)return;
 	static_init_pdb;
-	initialized = TRUE;
+	initialized = True;
 }
 
 BOOL smb_register_passdb(const char *name, pdb_init_function init, int version) 
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 3373b6c838..375fbeacc5 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -2614,5 +2614,5 @@ int pdb_ldap_init(void)
 {
 	smb_register_passdb("ldapsam", pdb_init_ldapsam, PASSDB_INTERFACE_VERSION);
 	smb_register_passdb("ldapsam_nua", pdb_init_ldapsam_nua, PASSDB_INTERFACE_VERSION);
-	return TRUE;
+	return True;
 }
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index bcbeb74808..7f74196633 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -1584,5 +1584,5 @@ int pdb_smbpasswd_init(void)
 {
 	smb_register_passdb("smbpasswd", pdb_init_smbpasswd, PASSDB_INTERFACE_VERSION);
 	smb_register_passdb("smbpasswd_nua", pdb_init_smbpasswd_nua, PASSDB_INTERFACE_VERSION);
-	return TRUE;
+	return True;
 }
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 9337eef106..4588389f75 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -28,7 +28,7 @@ static pstring username;
 static pstring owner_username;
 static fstring server;
 static int got_pass;
-static int test_args = FALSE;
+static int test_args = False;
 static TALLOC_CTX *ctx;
 
 #define CREATE_ACCESS_READ READ_CONTROL_ACCESS
@@ -36,7 +36,7 @@ static TALLOC_CTX *ctx;
 
 /* numeric is set when the user wants numeric SIDs and ACEs rather
    than going via LSA calls to resolve them */
-static BOOL numeric = FALSE;
+static BOOL numeric = False;
 
 enum acl_mode {SMB_ACL_SET, SMB_ACL_DELETE, SMB_ACL_MODIFY, SMB_ACL_ADD };
 enum chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP};
@@ -758,8 +758,8 @@ static struct cli_state *connect_one(const char *share)
 		{ "set", 'S', POPT_ARG_STRING, NULL, 'S', "Set acls", "ACLS" },
 		{ "chown", 'C', POPT_ARG_STRING, NULL, 'C', "Change ownership of a file", "USERNAME" },
 		{ "chgrp", 'G', POPT_ARG_STRING, NULL, 'G', "Change group ownership of a file", "GROUPNAME" },
-		{ "numeric", 'n', POPT_ARG_VAL, &numeric, TRUE, "Don't resolve sids or masks to names" },
-		{ "test-args", 't', POPT_ARG_VAL, &test_args, TRUE, "Test arguments"},
+		{ "numeric", 'n', POPT_ARG_VAL, &numeric, True, "Don't resolve sids or masks to names" },
+		{ "test-args", 't', POPT_ARG_VAL, &test_args, True, "Test arguments"},
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile },
diff --git a/source3/web/swat.c b/source3/web/swat.c
index bece4e71e2..92dece6ecd 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -1266,7 +1266,7 @@ static void printers_page(void)
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
-		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, TRUE, "Disable authentication (demo mode)" },
+		{ "disable-authentication", 'a', POPT_ARG_VAL, &demo_mode, True, "Disable authentication (demo mode)" },
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version},
 		{ NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile},
 		{ 0, 0, 0, 0 }