diff options
Diffstat (limited to 'source4/lib')
-rw-r--r-- | source4/lib/charset/iconv.c | 2 | ||||
-rw-r--r-- | source4/lib/charset/util_unistr.c | 12 | ||||
-rw-r--r-- | source4/lib/messaging/irpc.h | 6 | ||||
-rw-r--r-- | source4/lib/registry/registry.h | 2 | ||||
-rw-r--r-- | source4/lib/registry/util.c | 8 | ||||
-rw-r--r-- | source4/lib/samba3/smbpasswd.c | 4 | ||||
-rw-r--r-- | source4/lib/samba3/tdbsam.c | 28 | ||||
-rw-r--r-- | source4/lib/socket/socket.h | 4 | ||||
-rw-r--r-- | source4/lib/tls/tls.h | 4 |
9 files changed, 35 insertions, 35 deletions
diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c index dacb65ccad..d10b3bb03c 100644 --- a/source4/lib/charset/iconv.c +++ b/source4/lib/charset/iconv.c @@ -148,7 +148,7 @@ size_t smb_iconv(smb_iconv_t cd, return 0; } -static BOOL is_utf16(const char *name) +static bool is_utf16(const char *name) { return strcasecmp(name, "UCS-2LE") == 0 || strcasecmp(name, "UTF-16LE") == 0; diff --git a/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c index feac7a65e9..3fa3bf75a9 100644 --- a/source4/lib/charset/util_unistr.c +++ b/source4/lib/charset/util_unistr.c @@ -160,10 +160,10 @@ _PUBLIC_ int strcasecmp_m(const char *s1, const char *s2) * Based on a routine by GJC@VILLAGE.COM. * Extensively modified by Andrew.Tridgell@anu.edu.au **/ -_PUBLIC_ BOOL next_token(const char **ptr,char *buff, const char *sep, size_t bufsize) +_PUBLIC_ bool next_token(const char **ptr,char *buff, const char *sep, size_t bufsize) { const char *s; - BOOL quoted; + bool quoted; size_t len=1; if (!ptr) @@ -248,7 +248,7 @@ _PUBLIC_ int strncasecmp_m(const char *s1, const char *s2, size_t n) * * @note The comparison is case-insensitive. **/ -_PUBLIC_ BOOL strequal_w(const char *s1, const char *s2) +_PUBLIC_ bool strequal_w(const char *s1, const char *s2) { return strcasecmp_m(s1,s2) == 0; } @@ -256,7 +256,7 @@ _PUBLIC_ BOOL strequal_w(const char *s1, const char *s2) /** Compare 2 strings (case sensitive). **/ -_PUBLIC_ BOOL strcsequal_w(const char *s1,const char *s2) +_PUBLIC_ bool strcsequal_w(const char *s1,const char *s2) { if (s1 == s2) return(True); @@ -429,7 +429,7 @@ _PUBLIC_ char *strrchr_m(const char *s, char c) /** return True if any (multi-byte) character is lower case */ -_PUBLIC_ BOOL strhaslower(const char *string) +_PUBLIC_ bool strhaslower(const char *string) { while (*string) { size_t c_size; @@ -452,7 +452,7 @@ _PUBLIC_ BOOL strhaslower(const char *string) /** return True if any (multi-byte) character is upper case */ -_PUBLIC_ BOOL strhasupper(const char *string) +_PUBLIC_ bool strhasupper(const char *string) { while (*string) { size_t c_size; diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h index 40640c8545..bcfc1f1ab4 100644 --- a/source4/lib/messaging/irpc.h +++ b/source4/lib/messaging/irpc.h @@ -29,7 +29,7 @@ struct irpc_message { void *private; struct irpc_header header; struct ndr_pull *ndr; - BOOL defer_reply; + bool defer_reply; struct messaging_context *msg_ctx; struct irpc_list *irpc; void *data; @@ -67,8 +67,8 @@ struct irpc_request { int callid; void *r; NTSTATUS status; - BOOL done; - BOOL reject_free; + bool done; + bool reject_free; TALLOC_CTX *mem_ctx; struct { void (*fn)(struct irpc_request *); diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index acfe056616..ded5e4cc48 100644 --- a/source4/lib/registry/registry.h +++ b/source4/lib/registry/registry.h @@ -257,7 +257,7 @@ _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx, uint32_t type, const DATA_BLOB data); _PUBLIC_ char *reg_val_description(TALLOC_CTX *mem_ctx, const char *name, uint32_t type, const DATA_BLOB data); -_PUBLIC_ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *data_str, uint32_t *type, DATA_BLOB *data); +_PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *data_str, uint32_t *type, DATA_BLOB *data); WERROR reg_open_key_abs(TALLOC_CTX *mem_ctx, struct registry_context *handle, const char *name, struct registry_key **result); WERROR reg_key_del_abs(struct registry_context *ctx, const char *path); WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx, const char *path, uint32_t access_mask, struct security_descriptor *sec_desc, struct registry_key **result); diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c index 47716f89cf..6afd1bc44c 100644 --- a/source4/lib/registry/util.c +++ b/source4/lib/registry/util.c @@ -96,7 +96,7 @@ _PUBLIC_ char *reg_val_description(TALLOC_CTX *mem_ctx, const char *name, reg_val_data_string(mem_ctx, data_type, data)); } -_PUBLIC_ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *data_str, uint32_t *type, DATA_BLOB *data) +_PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *data_str, uint32_t *type, DATA_BLOB *data) { int i; *type = -1; @@ -110,7 +110,7 @@ _PUBLIC_ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const } if (*type == -1) - return False; + return false; /* Convert data appropriately */ @@ -138,9 +138,9 @@ _PUBLIC_ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const default: /* FIXME */ - return False; + return false; } - return True; + return true; } /** Open a key by name (including the predefined key name!) */ diff --git a/source4/lib/samba3/smbpasswd.c b/source4/lib/samba3/smbpasswd.c index b7961cde11..39e2448b98 100644 --- a/source4/lib/samba3/smbpasswd.c +++ b/source4/lib/samba3/smbpasswd.c @@ -118,7 +118,7 @@ char *smbpasswd_sethexpwd(TALLOC_CTX *mem_ctx, struct samr_Password *pwd, uint16 uint16_t smbpasswd_decode_acb_info(const char *p) { uint16_t acb_info = 0; - BOOL finished = False; + bool finished = false; /* * Check if the account type bits have been encoded after the @@ -170,7 +170,7 @@ uint16_t smbpasswd_decode_acb_info(const char *p) case '\n': case ']': default: - finished = True; + finished = true; break; } } diff --git a/source4/lib/samba3/tdbsam.c b/source4/lib/samba3/tdbsam.c index 84fef638bf..8e6b0daf2b 100644 --- a/source4/lib/samba3/tdbsam.c +++ b/source4/lib/samba3/tdbsam.c @@ -30,7 +30,7 @@ #define TDB_FORMAT_STRING_V2 "dddddddBBBBBBBBBBBBddBBBwwdBwwd" #define TDBSAM_VERSION_STRING "INFO/version" -static BOOL init_sam_from_buffer_v0(TDB_CONTEXT *tdb, struct samba3_samaccount *sampass, TDB_DATA buf) +static bool init_sam_from_buffer_v0(TDB_CONTEXT *tdb, struct samba3_samaccount *sampass, TDB_DATA buf) { uint32_t username_len, domain_len, nt_username_len, dir_drive_len, unknown_str_len, munged_dial_len, @@ -43,7 +43,7 @@ static BOOL init_sam_from_buffer_v0(TDB_CONTEXT *tdb, struct samba3_samaccount * if(sampass == NULL || buf.dptr == NULL) { DEBUG(0, ("init_sam_from_buffer_v0: NULL parameters found!\n")); - return False; + return false; } /* unpack the buffer into variables */ @@ -80,13 +80,13 @@ static BOOL init_sam_from_buffer_v0(TDB_CONTEXT *tdb, struct samba3_samaccount * &sampass->unknown_6); /* d */ if (len == (uint32_t) -1) { - return False; + return false; } - return True; + return true; } -static BOOL init_sam_from_buffer_v1(TDB_CONTEXT *tdb, struct samba3_samaccount *sampass, TDB_DATA buf) +static bool init_sam_from_buffer_v1(TDB_CONTEXT *tdb, struct samba3_samaccount *sampass, TDB_DATA buf) { uint32_t username_len, domain_len, nt_username_len, dir_drive_len, unknown_str_len, munged_dial_len, @@ -99,7 +99,7 @@ static BOOL init_sam_from_buffer_v1(TDB_CONTEXT *tdb, struct samba3_samaccount * if(sampass == NULL || buf.dptr == NULL) { DEBUG(0, ("init_sam_from_buffer_v1: NULL parameters found!\n")); - return False; + return false; } /* unpack the buffer into variables */ @@ -138,13 +138,13 @@ static BOOL init_sam_from_buffer_v1(TDB_CONTEXT *tdb, struct samba3_samaccount * &sampass->unknown_6); /* d */ if (len == (uint32_t) -1) { - return False; + return false; } - return True; + return true; } -static BOOL init_sam_from_buffer_v2(TDB_CONTEXT *tdb, struct samba3_samaccount *sampass, TDB_DATA buf) +static bool init_sam_from_buffer_v2(TDB_CONTEXT *tdb, struct samba3_samaccount *sampass, TDB_DATA buf) { uint32_t username_len, domain_len, nt_username_len, dir_drive_len, unknown_str_len, munged_dial_len, @@ -156,7 +156,7 @@ static BOOL init_sam_from_buffer_v2(TDB_CONTEXT *tdb, struct samba3_samaccount * if(sampass == NULL || buf.dptr == NULL) { DEBUG(0, ("init_sam_from_buffer_v2: NULL parameters found!\n")); - return False; + return false; } /* unpack the buffer into variables */ @@ -196,10 +196,10 @@ static BOOL init_sam_from_buffer_v2(TDB_CONTEXT *tdb, struct samba3_samaccount * &sampass->unknown_6); /* d */ if (len == (uint32_t) -1) { - return False; + return false; } - return True; + return true; } NTSTATUS samba3_read_tdbsam(const char *filename, TALLOC_CTX *ctx, struct samba3_samaccount **accounts, uint32_t *count) @@ -233,7 +233,7 @@ NTSTATUS samba3_read_tdbsam(const char *filename, TALLOC_CTX *ctx, struct samba3 for (key = tdb_firstkey(tdb); key.dptr; key = tdb_nextkey(tdb, key)) { - BOOL ret; + bool ret; if (strncmp((const char *)key.dptr, "USER_", 5) != 0) continue; @@ -246,7 +246,7 @@ NTSTATUS samba3_read_tdbsam(const char *filename, TALLOC_CTX *ctx, struct samba3 case 0: ret = init_sam_from_buffer_v0(tdb, &(*accounts)[*count], val); break; case 1: ret = init_sam_from_buffer_v1(tdb, &(*accounts)[*count], val); break; case 2: ret = init_sam_from_buffer_v2(tdb, &(*accounts)[*count], val); break; - default: ret = False; break; + default: ret = false; break; } diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h index 6bc03188a5..0c4fc0bb95 100644 --- a/source4/lib/socket/socket.h +++ b/source4/lib/socket/socket.h @@ -164,10 +164,10 @@ struct socket_address *socket_address_from_sockaddr(TALLOC_CTX *mem_ctx, struct sockaddr *sockaddr, size_t addrlen); const struct socket_ops *socket_getops_byname(const char *name, enum socket_type type); -BOOL allow_access(TALLOC_CTX *mem_ctx, +bool allow_access(TALLOC_CTX *mem_ctx, const char **deny_list, const char **allow_list, const char *cname, const char *caddr); -BOOL socket_check_access(struct socket_context *sock, +bool socket_check_access(struct socket_context *sock, const char *service_name, const char **allow_list, const char **deny_list); diff --git a/source4/lib/tls/tls.h b/source4/lib/tls/tls.h index dac5b7e2ad..6f1e3d2424 100644 --- a/source4/lib/tls/tls.h +++ b/source4/lib/tls/tls.h @@ -52,13 +52,13 @@ struct socket_context *tls_init_client(struct socket_context *sock, /* return True if a connection used tls */ -BOOL tls_enabled(struct socket_context *tls); +bool tls_enabled(struct socket_context *tls); /* true if tls support is compiled in */ -BOOL tls_support(struct tls_params *parms); +bool tls_support(struct tls_params *parms); const struct socket_ops *socket_tls_ops(enum socket_type type); |