diff options
author | Jeremy Allison <jra@samba.org> | 2007-10-18 17:40:25 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2007-10-18 17:40:25 -0700 |
commit | 30191d1a5704ad2b158386b511558972d539ce47 (patch) | |
tree | 4f46e5c4f28f672ab661aa18f45745860970a88c /source3/modules/vfs_afsacl.c | |
parent | 789856f63ff73fec66298e95c91c60db7bdaf14e (diff) | |
download | samba-30191d1a5704ad2b158386b511558972d539ce47.tar.gz samba-30191d1a5704ad2b158386b511558972d539ce47.tar.bz2 samba-30191d1a5704ad2b158386b511558972d539ce47.zip |
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)
Diffstat (limited to 'source3/modules/vfs_afsacl.c')
-rw-r--r-- | source3/modules/vfs_afsacl.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index ba0ced9a4f..a1043d6f6a 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -39,12 +39,12 @@ extern const DOM_SID global_sid_NULL; static char space_replacement = '%'; /* Do we expect SIDs as pts names? */ -static BOOL sidpts; +static bool sidpts; extern int afs_syscall(int, char *, int, char *, int); struct afs_ace { - BOOL positive; + bool positive; char *name; DOM_SID sid; enum lsa_SidType type; @@ -65,7 +65,7 @@ struct afs_iob { }; -static BOOL init_afs_acl(struct afs_acl *acl) +static bool init_afs_acl(struct afs_acl *acl) { ZERO_STRUCT(*acl); acl->ctx = talloc_init("afs_acl"); @@ -105,7 +105,7 @@ static struct afs_ace *clone_afs_ace(TALLOC_CTX *mem_ctx, struct afs_ace *ace) } static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx, - BOOL positive, + bool positive, const char *name, uint32 rights) { DOM_SID sid; @@ -188,7 +188,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx, } static void add_afs_ace(struct afs_acl *acl, - BOOL positive, + bool positive, const char *name, uint32 rights) { struct afs_ace *ace; @@ -227,7 +227,7 @@ static void add_afs_ace(struct afs_acl *acl, * Second field: Rights */ -static BOOL parse_afs_acl(struct afs_acl *acl, const char *acl_str) +static bool parse_afs_acl(struct afs_acl *acl, const char *acl_str) { int nplus, nminus; int aces; @@ -290,7 +290,7 @@ static BOOL parse_afs_acl(struct afs_acl *acl, const char *acl_str) return True; } -static BOOL unparse_afs_acl(struct afs_acl *acl, char *acl_str) +static bool unparse_afs_acl(struct afs_acl *acl, char *acl_str) { /* TODO: String length checks!!!! */ @@ -414,7 +414,7 @@ static void split_afs_acl(struct afs_acl *acl, return; } -static BOOL same_principal(struct afs_ace *x, struct afs_ace *y) +static bool same_principal(struct afs_ace *x, struct afs_ace *y) { return ( (x->positive == y->positive) && (sid_compare(&x->sid, &y->sid) == 0) ); @@ -430,7 +430,7 @@ static void merge_afs_acls(struct afs_acl *dir_acl, for (ace = dir_acl->acelist; ace != NULL; ace = ace->next) { struct afs_ace *file_ace; - BOOL found = False; + bool found = False; for (file_ace = file_acl->acelist; file_ace != NULL; @@ -450,7 +450,7 @@ static void merge_afs_acls(struct afs_acl *dir_acl, for (ace = file_acl->acelist; ace != NULL; ace = ace->next) { struct afs_ace *dir_ace; - BOOL already_seen = False; + bool already_seen = False; for (dir_ace = dir_acl->acelist; dir_ace != NULL; @@ -668,7 +668,7 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl, return sd_size; } -static BOOL mappable_sid(const DOM_SID *sid) +static bool mappable_sid(const DOM_SID *sid) { DOM_SID domain_sid; @@ -692,7 +692,7 @@ static BOOL mappable_sid(const DOM_SID *sid) return False; } -static BOOL nt_to_afs_acl(const char *filename, +static bool nt_to_afs_acl(const char *filename, uint32 security_info_sent, struct security_descriptor *psd, uint32 (*nt_to_afs_rights)(const char *filename, @@ -795,7 +795,7 @@ static BOOL nt_to_afs_acl(const char *filename, return True; } -static BOOL afs_get_afs_acl(char *filename, struct afs_acl *acl) +static bool afs_get_afs_acl(char *filename, struct afs_acl *acl) { struct afs_iob iob; |