diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-22 18:35:01 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-23 15:02:26 +0200 |
| commit | 51e3547426bcfe9ae086c12bff95dfc31aba5e24 (patch) | |
| tree | 0d1eced60a65f401c6255734080b36b2a2576236 /source3/smbd | |
| parent | 8f909199c4964a4f501520bb687d88471daf6af6 (diff) | |
| download | samba-51e3547426bcfe9ae086c12bff95dfc31aba5e24.tar.gz samba-51e3547426bcfe9ae086c12bff95dfc31aba5e24.tar.bz2 samba-51e3547426bcfe9ae086c12bff95dfc31aba5e24.zip | |
s3-pysmbd: Allow a mode to be specified for the simple ACL
The additional group for the ACL is now optional.
Andrew Bartlett
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/pysmbd.c | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c index 6456797d63..6866ff3539 100644 --- a/source3/smbd/pysmbd.c +++ b/source3/smbd/pysmbd.c @@ -151,10 +151,13 @@ static NTSTATUS set_nt_acl_no_snum(const char *fname, } -static SMB_ACL_T make_simple_acl(uid_t uid, gid_t gid) +static SMB_ACL_T make_simple_acl(gid_t gid, mode_t chmod_mode) { mode_t mode = SMB_ACL_READ|SMB_ACL_WRITE; - mode_t mode0 = 0; + + mode_t mode_user = (chmod_mode & 0700) >> 16; + mode_t mode_group = (chmod_mode & 070) >> 8; + mode_t mode_other = chmod_mode & 07; SMB_ACL_ENTRY_T entry; SMB_ACL_T acl = sys_acl_init(4); @@ -173,7 +176,7 @@ static SMB_ACL_T make_simple_acl(uid_t uid, gid_t gid) return NULL; } - if (sys_acl_set_permset(entry, &mode) != 0) { + if (sys_acl_set_permset(entry, &mode_user) != 0) { TALLOC_FREE(acl); return NULL; } @@ -188,7 +191,7 @@ static SMB_ACL_T make_simple_acl(uid_t uid, gid_t gid) return NULL; } - if (sys_acl_set_permset(entry, &mode) != 0) { + if (sys_acl_set_permset(entry, &mode_group) != 0) { TALLOC_FREE(acl); return NULL; } @@ -203,29 +206,31 @@ static SMB_ACL_T make_simple_acl(uid_t uid, gid_t gid) return NULL; } - if (sys_acl_set_permset(entry, &mode0) != 0) { - TALLOC_FREE(acl); - return NULL; - } - - if (sys_acl_create_entry(&acl, &entry) != 0) { - TALLOC_FREE(acl); - return NULL; - } - - if (sys_acl_set_tag_type(entry, SMB_ACL_GROUP) != 0) { + if (sys_acl_set_permset(entry, &mode_other) != 0) { TALLOC_FREE(acl); return NULL; } - if (sys_acl_set_qualifier(entry, &gid) != 0) { - TALLOC_FREE(acl); - return NULL; - } - - if (sys_acl_set_permset(entry, &mode) != 0) { - TALLOC_FREE(acl); - return NULL; + if (gid != -1) { + if (sys_acl_create_entry(&acl, &entry) != 0) { + TALLOC_FREE(acl); + return NULL; + } + + if (sys_acl_set_tag_type(entry, SMB_ACL_GROUP) != 0) { + TALLOC_FREE(acl); + return NULL; + } + + if (sys_acl_set_qualifier(entry, &gid) != 0) { + TALLOC_FREE(acl); + return NULL; + } + + if (sys_acl_set_permset(entry, &mode_group) != 0) { + TALLOC_FREE(acl); + return NULL; + } } if (sys_acl_create_entry(&acl, &entry) != 0) { @@ -238,7 +243,7 @@ static SMB_ACL_T make_simple_acl(uid_t uid, gid_t gid) return NULL; } - if (sys_acl_set_permset(entry, &mode0) != 0) { + if (sys_acl_set_permset(entry, &mode) != 0) { TALLOC_FREE(acl); return NULL; } @@ -252,14 +257,14 @@ static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args) { NTSTATUS status; char *fname; - int uid, gid; + int mode, gid = -1; SMB_ACL_T acl; TALLOC_CTX *frame; - if (!PyArg_ParseTuple(args, "sii", &fname, &uid, &gid)) + if (!PyArg_ParseTuple(args, "si|i", &fname, &mode, &gid)) return NULL; - acl = make_simple_acl(uid, gid); + acl = make_simple_acl(gid, mode); frame = talloc_stackframe(); |