diff options
Diffstat (limited to 'source3/modules')
-rw-r--r-- | source3/modules/nfs4_acls.c | 8 | ||||
-rw-r--r-- | source3/modules/vfs_afsacl.c | 12 | ||||
-rw-r--r-- | source3/modules/vfs_aixacl2.c | 4 | ||||
-rw-r--r-- | source3/modules/vfs_gpfs.c | 4 | ||||
-rw-r--r-- | source3/modules/vfs_zfsacl.c | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 200f87a559..31a9b01619 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -82,7 +82,7 @@ static SMB_ACE4_INT_T *get_validated_aceint(SMB4ACE_T *ace) SMB4ACL_T *smb_create_smb4acl(void) { - TALLOC_CTX *mem_ctx = main_loop_talloc_get(); + TALLOC_CTX *mem_ctx = talloc_tos(); SMB_ACL4_INT_T *acl = (SMB_ACL4_INT_T *)TALLOC_ZERO_SIZE(mem_ctx, sizeof(SMB_ACL4_INT_T)); if (acl==NULL) { @@ -98,7 +98,7 @@ SMB4ACL_T *smb_create_smb4acl(void) SMB4ACE_T *smb_add_ace4(SMB4ACL_T *acl, SMB_ACE4PROP_T *prop) { SMB_ACL4_INT_T *aclint = get_validated_aclint(acl); - TALLOC_CTX *mem_ctx = main_loop_talloc_get(); + TALLOC_CTX *mem_ctx = talloc_tos(); SMB_ACE4_INT_T *ace; ace = (SMB_ACE4_INT_T *)TALLOC_ZERO_SIZE(mem_ctx, sizeof(SMB_ACE4_INT_T)); @@ -267,7 +267,7 @@ size_t smb_get_nt_acl_nfs4(files_struct *fsp, size_t sd_size = 0; SEC_ACE *nt_ace_list = NULL; SEC_ACL *psa = NULL; - TALLOC_CTX *mem_ctx = main_loop_talloc_get(); + TALLOC_CTX *mem_ctx = talloc_tos(); DEBUG(10, ("smb_get_nt_acl_nfs4 invoked for %s\n", fsp->fsp_name)); @@ -529,7 +529,7 @@ static SMB4ACL_T *smbacl4_win2nfs4( { SMB4ACL_T *acl; uint32 i; - TALLOC_CTX *mem_ctx = main_loop_talloc_get(); + TALLOC_CTX *mem_ctx = talloc_tos(); DEBUG(10, ("smbacl4_win2nfs4 invoked\n")); diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 633b4e2ccd..ba0ced9a4f 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -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)); @@ -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; @@ -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; diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index b4e28be5d8..8226ccd33d 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -66,7 +66,7 @@ static AIXJFS2_ACL_T *aixjfs2_getacl_alloc(const char *fname, acl_type_t *type) uint64_t ctl_flag=0; TALLOC_CTX *mem_ctx; - mem_ctx = main_loop_talloc_get(); + mem_ctx = talloc_tos(); acl = (AIXJFS2_ACL_T *)TALLOC_SIZE(mem_ctx, len); if (acl == NULL) { errno = ENOMEM; @@ -303,7 +303,7 @@ static BOOL aixjfs2_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) DEBUG(10, ("jfs2_process_smbacl invoked on %s\n", fsp->fsp_name)); /* no need to be freed which is alloced with mem_ctx */ - mem_ctx = main_loop_talloc_get(); + mem_ctx = talloc_tos(); entryLen = sizeof(nfs4_ace_int_t); if (entryLen & 0x03) diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 393efd2328..b8e8209be0 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -101,7 +101,7 @@ static struct gpfs_acl *gpfs_getacl_alloc(const char *fname, gpfs_aclType_t type struct gpfs_acl *acl; size_t len = 200; int ret; - TALLOC_CTX *mem_ctx = main_loop_talloc_get(); + TALLOC_CTX *mem_ctx = talloc_tos(); acl = (struct gpfs_acl *)TALLOC_SIZE(mem_ctx, len); if (acl == NULL) { @@ -267,7 +267,7 @@ static BOOL gpfsacl_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) gpfs_aclLen_t gacl_len; SMB4ACE_T *smbace; struct gpfs_acl *gacl; - TALLOC_CTX *mem_ctx = main_loop_talloc_get(); + TALLOC_CTX *mem_ctx = talloc_tos(); gacl_len = sizeof(struct gpfs_acl) + (smb_get_naces(smbacl)-1)*sizeof(gpfs_ace_v4_t); diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index 9217d4c8bc..fd057fa089 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -53,7 +53,7 @@ static size_t zfs_get_nt_acl(struct files_struct *fsp, uint32 security_info, return 0; } /* allocate the field of ZFS aces */ - mem_ctx = main_loop_talloc_get(); + mem_ctx = talloc_tos(); acebuf = (ace_t *) talloc_size(mem_ctx, sizeof(ace_t)*naces); if(acebuf == NULL) { errno = ENOMEM; @@ -102,7 +102,7 @@ static BOOL zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) TALLOC_CTX *mem_ctx; /* allocate the field of ZFS aces */ - mem_ctx = main_loop_talloc_get(); + mem_ctx = talloc_tos(); acebuf = (ace_t *) talloc_size(mem_ctx, sizeof(ace_t)*naces); if(acebuf == NULL) { errno = ENOMEM; |