diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-30 13:04:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:09 +1000 |
| commit | 3bb77516b841def60e08e50bafc37517dd9d3ae0 (patch) | |
| tree | 6e2731a3ec26268648c42c09387c180b778f5cda /source3/lib/util_seaccess.c | |
| parent | b057867de3fbb423ef6afb9b7038ab99c83124d8 (diff) | |
| download | samba-3bb77516b841def60e08e50bafc37517dd9d3ae0.tar.gz samba-3bb77516b841def60e08e50bafc37517dd9d3ae0.tar.bz2 samba-3bb77516b841def60e08e50bafc37517dd9d3ae0.zip | |
s3-privs Convert from user_has_privileges() -> security_token_has_privilege()
This new call is available in the merged privileges code, and
takes an enum as the parameter, rather than a bitmask.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/lib/util_seaccess.c')
| -rw-r--r-- | source3/lib/util_seaccess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c index 3bedec6865..7e803fcfce 100644 --- a/source3/lib/util_seaccess.c +++ b/source3/lib/util_seaccess.c @@ -113,7 +113,7 @@ static uint32_t access_check_max_allowed(const struct security_descriptor *sd, if (is_sid_in_token(token, sd->owner_sid)) { granted |= SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL | SEC_STD_DELETE; - } else if (user_has_privileges(token, &se_restore)) { + } else if (security_token_has_privilege(token, SEC_PRIV_RESTORE)) { granted |= SEC_STD_DELETE; } @@ -203,7 +203,7 @@ NTSTATUS se_access_check(const struct security_descriptor *sd, bits_remaining &= ~(SEC_STD_WRITE_DAC|SEC_STD_READ_CONTROL|SEC_STD_DELETE); } if ((bits_remaining & SEC_STD_DELETE) && - user_has_privileges(token, &se_restore)) { + (security_token_has_privilege(token, SEC_PRIV_RESTORE))) { bits_remaining &= ~SEC_STD_DELETE; } |