sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s3-smbd: Add security_info_wanted argument to get_nt_acl_no_snum

Browse Source 
I need to get at the owner, group, DACL and SACL when testing correct
ACL storage.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2012-08-23 09:45:07 +10:00
parent e058dfb3b0
commit 0aed29105e
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source3/rpc_server/eventlog/srv_eventlog_nt.c
View File

@ -91,7 +91,7 @@ static bool elog_check_access( EVENTLOG_INFO *info, const struct security_token
/* get the security descriptor for the file */
sec_desc = get_nt_acl_no_snum( info, tdbname );
sec_desc = get_nt_acl_no_snum( info, tdbname, SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL);
TALLOC_FREE( tdbname );
if ( !sec_desc ) {

4
source3/smbd/posix_acls.c
View File

@ -4842,7 +4842,7 @@ bool set_unix_posix_acl(connection_struct *conn, files_struct *fsp, const char *
Assume we are dealing with files (for now)
********************************************************************/
struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname)
struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname, uint32 security_info_wanted)
{
struct security_descriptor *psd, *ret_sd;
connection_struct *conn;
@ -4890,7 +4890,7 @@ struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fna
return NULL;
}
if (!NT_STATUS_IS_OK(SMB_VFS_FGET_NT_ACL( &finfo, SECINFO_DACL, &psd))) {
if (!NT_STATUS_IS_OK(SMB_VFS_FGET_NT_ACL( &finfo, security_info_wanted, &psd))) {
DEBUG(0,("get_nt_acl_no_snum: get_nt_acl returned zero.\n"));
TALLOC_FREE(finfo.fsp_name);
conn_free(conn);

2
source3/smbd/proto.h
View File

@ -729,7 +729,7 @@ bool set_unix_posix_default_acl(connection_struct *conn, const char *fname,
const SMB_STRUCT_STAT *psbuf,
uint16 num_def_acls, const char *pdata);
bool set_unix_posix_acl(connection_struct *conn, files_struct *fsp, const char *fname, uint16 num_acls, const char *pdata);
struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname);
struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname, uint32 security_info_wanted);
NTSTATUS make_default_filesystem_acl(TALLOC_CTX *ctx,
const char *name,
SMB_STRUCT_STAT *psbuf,

6
source3/smbd/pysmbd.c
View File

@ -372,15 +372,15 @@ static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args)
static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args)
{
char *fname;
int security_info_sent;
int security_info_wanted;
PyObject *py_sd;
struct security_descriptor *sd;
TALLOC_CTX *tmp_ctx = talloc_new(NULL);
if (!PyArg_ParseTuple(args, "si", &fname, &security_info_sent))
if (!PyArg_ParseTuple(args, "si", &fname, &security_info_wanted))
return NULL;
sd = get_nt_acl_no_snum(tmp_ctx, fname);
sd = get_nt_acl_no_snum(tmp_ctx, fname, security_info_wanted);
py_sd = py_return_ndr_struct("samba.dcerpc.security", "descriptor", sd, sd);

2
source4/scripting/python/samba/ntacls.py
View File

@ -79,7 +79,7 @@ def getntacl(lp, file, backend=None, eadbfile=None, direct_db_access=True):
elif ntacl.version == 3:
return ntacl.info.sd
else:
return smbd.get_nt_acl(file)
return smbd.get_nt_acl(file, security.SECINFO_OWNER | security.SECINFO_GROUP | security.SECINFO_DACL | security.SECINFO_SACL)
def setntacl(lp, file, sddl, domsid, backend=None, eadbfile=None, use_ntvfs=True):