-/*
+/*
* Convert AFS acls to NT acls and vice versa.
*
* Copyright (C) Volker Lendecke, 2003
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <afs/venus.h>
#include <afs/prs_fs.h>
-#define MAXSIZE 2048
+#define MAXSIZE 2049
extern const struct dom_sid global_sid_World;
extern const struct dom_sid global_sid_Builtin_Administrators;
/* Do we expect SIDs as pts names? */
static bool sidpts;
-extern int afs_syscall(int, char *, int, char *, int);
+extern int afs_syscall(int, const char *, int, char *, int);
struct afs_ace {
bool positive;
acl->ctx = talloc_init("afs_acl");
if (acl->ctx == NULL) {
DEBUG(10, ("Could not init afs_acl"));
- return False;
+ return false;
}
- return True;
+ return true;
}
static void free_afs_acl(struct afs_acl *acl)
static struct afs_ace *clone_afs_ace(TALLOC_CTX *mem_ctx, struct afs_ace *ace)
{
- struct afs_ace *result = TALLOC_P(mem_ctx, struct afs_ace);
+ struct afs_ace *result = talloc(mem_ctx, struct afs_ace);
if (result == NULL)
return NULL;
}
}
- result = TALLOC_P(mem_ctx, struct afs_ace);
+ result = talloc(mem_ctx, struct afs_ace);
if (result == NULL) {
DEBUG(0, ("Could not talloc AFS ace\n"));
DEBUG(10, ("add_afs_ace: Added %s entry for %s with rights %d\n",
ace->positive?"positive":"negative",
ace->name, ace->rights));
-
- return;
}
/* AFS ACLs in string form are a long string of fields delimited with \n.
int nplus, nminus;
int aces;
- char str[MAXSIZE+1];
+ char str[MAXSIZE];
char *p = str;
- strncpy(str, acl_str, MAXSIZE);
+ strlcpy(str, acl_str, MAXSIZE);
if (sscanf(p, "%d", &nplus) != 1)
- return False;
+ return false;
DEBUG(10, ("Found %d positive entries\n", nplus));
if ((p = strchr(p, '\n')) == NULL)
- return False;
+ return false;
p += 1;
if (sscanf(p, "%d", &nminus) != 1)
- return False;
+ return false;
DEBUG(10, ("Found %d negative entries\n", nminus));
if ((p = strchr(p, '\n')) == NULL)
- return False;
+ return false;
p += 1;
for (aces = nplus+nminus; aces > 0; aces--)
namep = p;
if ((p = strchr(p, '\t')) == NULL)
- return False;
+ return false;
*p = '\0';
p += 1;
if (sscanf(p, "%d", &rights) != 1)
- return False;
+ return false;
if ((p = strchr(p, '\n')) == NULL)
- return False;
+ return false;
p += 1;
fstrcpy(name, namep);
nplus -= 1;
}
- return True;
+ return true;
}
static bool unparse_afs_acl(struct afs_acl *acl, char *acl_str)
int positives = 0;
int negatives = 0;
fstring line;
+ struct afs_ace *ace = acl->acelist;
*acl_str = 0;
- struct afs_ace *ace = acl->acelist;
-
while (ace != NULL) {
if (ace->positive)
positives++;
}
fstr_sprintf(line, "%d\n", positives);
- safe_strcat(acl_str, line, MAXSIZE);
+ if (strlcat(acl_str, line, MAXSIZE) >= MAXSIZE) {
+ return false;
+ }
fstr_sprintf(line, "%d\n", negatives);
- safe_strcat(acl_str, line, MAXSIZE);
+ if (strlcat(acl_str, line, MAXSIZE) >= MAXSIZE) {
+ return false;
+ }
ace = acl->acelist;
while (ace != NULL) {
fstr_sprintf(line, "%s\t%d\n", ace->name, ace->rights);
- safe_strcat(acl_str, line, MAXSIZE);
+ if (strlcat(acl_str, line, MAXSIZE) >= MAXSIZE) {
+ return false;
+ }
ace = ace->next;
}
- return True;
+ return true;
}
static uint32 afs_to_nt_file_rights(uint32 rights)
/* Only lookup right */
*flag = SEC_ACE_FLAG_CONTAINER_INHERIT;
}
-
- return;
}
#define AFS_FILE_RIGHTS (PRSFS_READ|PRSFS_WRITE|PRSFS_LOCK)
ace->rights & AFS_DIR_RIGHTS);
}
}
- return;
}
static bool same_principal(struct afs_ace *x, struct afs_ace *y)
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;
add_afs_ace(target, ace->positive, ace->name,
ace->rights | file_ace->rights);
- found = True;
+ found = true;
break;
}
if (!found)
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;
dir_ace = dir_ace->next) {
if (!same_principal(ace, dir_ace))
continue;
- already_seen = True;
+ already_seen = true;
break;
}
if (!already_seen)
static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
SMB_STRUCT_STAT *psbuf,
uint32 security_info,
+ TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
struct security_ace *nt_ace_list;
struct security_acl *psa = NULL;
int good_aces;
size_t sd_size;
- TALLOC_CTX *mem_ctx = talloc_tos();
struct afs_ace *afs_ace;
gid_to_sid(&group_sid, psbuf->st_ex_gid);
if (afs_acl->num_aces) {
- nt_ace_list = TALLOC_ARRAY(mem_ctx, struct security_ace, afs_acl->num_aces);
+ nt_ace_list = talloc_array(mem_ctx, struct security_ace, afs_acl->num_aces);
if (nt_ace_list == NULL)
return 0;
struct connection_struct *conn,
struct smb_filename *smb_fname,
uint32 security_info,
+ TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
int ret;
}
return afs_to_nt_acl_common(afs_acl, &smb_fname->st, security_info,
- ppdesc);
+ mem_ctx, ppdesc);
}
static size_t afs_fto_nt_acl(struct afs_acl *afs_acl,
struct files_struct *fsp,
uint32 security_info,
+ TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
SMB_STRUCT_STAT sbuf;
if (fsp->fh->fd == -1) {
/* Get the stat struct for the owner info. */
return afs_to_nt_acl(afs_acl, fsp->conn, fsp->fsp_name,
- security_info, ppdesc);
+ security_info, mem_ctx, ppdesc);
}
if(SMB_VFS_FSTAT(fsp, &sbuf) != 0) {
return 0;
}
- return afs_to_nt_acl_common(afs_acl, &sbuf, security_info, ppdesc);
+ return afs_to_nt_acl_common(afs_acl, &sbuf, security_info,
+ mem_ctx, ppdesc);
}
static bool mappable_sid(const struct dom_sid *sid)
struct dom_sid domain_sid;
if (dom_sid_compare(sid, &global_sid_Builtin_Administrators) == 0)
- return True;
+ return true;
if (dom_sid_compare(sid, &global_sid_World) == 0)
- return True;
+ return true;
if (dom_sid_compare(sid, &global_sid_Authenticated_Users) == 0)
- return True;
+ return true;
if (dom_sid_compare(sid, &global_sid_Builtin_Backup_Operators) == 0)
- return True;
+ return true;
string_to_sid(&domain_sid, "S-1-5-21");
if (sid_compare_domain(sid, &domain_sid) == 0)
- return True;
+ return true;
- return False;
+ return false;
}
static bool nt_to_afs_acl(const char *filename,
if (((security_info_sent & SECINFO_DACL) == 0) ||
(psd->dacl == NULL))
- return True;
+ return true;
if (!init_afs_acl(afs_acl))
- return False;
+ return false;
dacl = psd->dacl;
if (ace->type != SEC_ACE_TYPE_ACCESS_ALLOWED) {
/* First cut: Only positive ACEs */
- return False;
+ return false;
}
if (!mappable_sid(&ace->trustee)) {
dom_name, lp_winbind_separator(),
name);
if (tmp == NULL) {
- return False;
+ return false;
+ }
+ if (!strlower_m(tmp)) {
+ return false;
}
- strlower_m(tmp);
name = tmp;
}
talloc_tos(),
sid_string_tos(&ace->trustee));
if (name == NULL) {
- return False;
+ return false;
}
}
}
while ((p = strchr_m(name, ' ')) != NULL)
*p = space_replacement;
- add_afs_ace(afs_acl, True, name,
+ add_afs_ace(afs_acl, true, name,
nt_to_afs_rights(filename, ace));
}
- return True;
+ return true;
}
-static bool afs_get_afs_acl(char *filename, struct afs_acl *acl)
+static bool afs_get_afs_acl(const char *filename, struct afs_acl *acl)
{
struct afs_iob iob;
if (ret) {
DEBUG(1, ("got error from PIOCTL: %d\n", ret));
- return False;
+ return false;
}
if (!init_afs_acl(acl))
- return False;
+ return false;
if (!parse_afs_acl(acl, space)) {
DEBUG(1, ("Could not parse AFS acl\n"));
free_afs_acl(acl);
- return False;
+ return false;
}
- return True;
+ return true;
}
/* For setting an AFS ACL we have to take care of the ACEs we could
{
struct afs_acl old_afs_acl, new_afs_acl;
struct afs_acl dir_acl, file_acl;
- char acl_string[2049];
+ char acl_string[MAXSIZE];
struct afs_iob iob;
int ret = -1;
char *name = NULL;
fileacls = lp_parm_const_string(SNUM(handle->conn), "afsacl", "fileacls",
"yes");
- sidpts = lp_parm_bool(SNUM(handle->conn), "afsacl", "sidpts", False);
+ sidpts = lp_parm_bool(SNUM(handle->conn), "afsacl", "sidpts", false);
ZERO_STRUCT(old_afs_acl);
ZERO_STRUCT(new_afs_acl);
static NTSTATUS afsacl_fget_nt_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp,
uint32 security_info,
+ TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
struct afs_acl acl;
DEBUG(5, ("afsacl_fget_nt_acl: %s\n", fsp_str_dbg(fsp)));
- sidpts = lp_parm_bool(SNUM(fsp->conn), "afsacl", "sidpts", False);
+ sidpts = lp_parm_bool(SNUM(fsp->conn), "afsacl", "sidpts", false);
if (!afs_get_afs_acl(fsp->fsp_name->base_name, &acl)) {
return NT_STATUS_ACCESS_DENIED;
}
- sd_size = afs_fto_nt_acl(&acl, fsp, security_info, ppdesc);
+ sd_size = afs_fto_nt_acl(&acl, fsp, security_info, mem_ctx, ppdesc);
free_afs_acl(&acl);
}
static NTSTATUS afsacl_get_nt_acl(struct vfs_handle_struct *handle,
- const char *name, uint32 security_info,
+ const char *name, uint32 security_info,
+ TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
struct afs_acl acl;
DEBUG(5, ("afsacl_get_nt_acl: %s\n", name));
- sidpts = lp_parm_bool(SNUM(handle->conn), "afsacl", "sidpts", False);
+ sidpts = lp_parm_bool(SNUM(handle->conn), "afsacl", "sidpts", false);
if (!afs_get_afs_acl(name, &acl)) {
return NT_STATUS_ACCESS_DENIED;
}
sd_size = afs_to_nt_acl(&acl, handle->conn, smb_fname, security_info,
- ppdesc);
+ mem_ctx, ppdesc);
TALLOC_FREE(smb_fname);
free_afs_acl(&acl);
static struct vfs_fn_pointers vfs_afsacl_fns = {
.connect_fn = afsacl_connect,
- .fget_nt_acl = afsacl_fget_nt_acl,
- .get_nt_acl = afsacl_get_nt_acl,
- .fset_nt_acl = afsacl_fset_nt_acl
+ .fget_nt_acl_fn = afsacl_fget_nt_acl,
+ .get_nt_acl_fn = afsacl_get_nt_acl,
+ .fset_nt_acl_fn = afsacl_fset_nt_acl
};
NTSTATUS vfs_afsacl_init(void);
git.samba.org / abartlet / samba-debian.git / blobdiff