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

[nivanova/samba-autobuild/.git] / source3 / modules / vfs_afsacl.c

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 633b4e2ccda80a21eec0875b7de32696a12b56df..a1043d6f6ad0282d2606967c3cf650450888b5c4 100644 (file)
--- 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;
@@ -141,7 +141,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
                if (string_to_sid(&sid, name)) {
                        const char *user, *domain;
                        /* We have to find the type, look up the SID */
-                       lookup_sid(tmp_talloc_ctx(), &sid,
+                       lookup_sid(talloc_tos(), &sid,
                                   &domain, &user, &type);
                }
 
@@ -155,7 +155,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
                        *p = '\\';
                }
 
-               if (!lookup_name(tmp_talloc_ctx(), name, LOOKUP_NAME_ALL,
+               if (!lookup_name(talloc_tos(), name, LOOKUP_NAME_ALL,
                                 &domain, &uname, &sid, &type)) {
                        DEBUG(10, ("Could not find AFS user %s\n", name));
 
@@ -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;
@@ -597,7 +597,7 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
        SEC_ACL *psa = NULL;
        int good_aces;
        size_t sd_size;
-       TALLOC_CTX *mem_ctx = main_loop_talloc_get();
+       TALLOC_CTX *mem_ctx = talloc_tos();
 
        struct afs_ace *afs_ace;
 
@@ -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,
@@ -753,7 +753,7 @@ static BOOL nt_to_afs_acl(const char *filename,
 
                } else {
 
-                       if (!lookup_sid(tmp_talloc_ctx(), &ace->trustee,
+                       if (!lookup_sid(talloc_tos(), &ace->trustee,
                                        &dom_name, &name, &name_type)) {
                                DEBUG(1, ("AFSACL: Could not lookup SID %s on file %s\n",
                                          sid_string_static(&ace->trustee), filename));
@@ -764,7 +764,7 @@ static BOOL nt_to_afs_acl(const char *filename,
                             (name_type == SID_NAME_DOM_GRP) ||
                             (name_type == SID_NAME_ALIAS) ) {
                                char *tmp;
-                               tmp = talloc_asprintf(tmp_talloc_ctx(), "%s%s%s",
+                               tmp = talloc_asprintf(talloc_tos(), "%s%s%s",
                                                       dom_name, lp_winbind_separator(),
                                                       name);
                                if (tmp == NULL) {
@@ -777,7 +777,7 @@ static BOOL nt_to_afs_acl(const char *filename,
                        if (sidpts) {
                                /* Expect all users/groups in pts as SIDs */
                                name = talloc_strdup(
-                                       tmp_talloc_ctx(),
+                                       talloc_tos(),
                                        sid_string_static(&ace->trustee));
                                if (name == NULL) {
                                        return False;
@@ -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;