diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 00:34:39 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 00:34:39 +0100 |
| commit | 72a1e3acfa5789134a28fb0609bc88b25c0e0b15 (patch) | |
| tree | e7a7e8aaddbae9a97543d5b13bc16ce2e154c134 /source3/include/proto.h | |
| parent | 59206674521065e041a6020f9ba793fac47b1d7d (diff) | |
| parent | ff274e57eacb9ac4c81adfcfea4f7b4b668a7d94 (diff) | |
| download | samba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.tar.gz samba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.tar.bz2 samba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/proto.h')
| -rw-r--r-- | source3/include/proto.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 65dda2ac3d..c6609be5d6 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1417,9 +1417,8 @@ WERROR registry_push_value(TALLOC_CTX *mem_ctx, void se_map_generic(uint32 *access_mask, const struct generic_mapping *mapping); void security_acl_map_generic(struct security_acl *sa, const struct generic_mapping *mapping); void se_map_standard(uint32 *access_mask, struct standard_mapping *mapping); -bool se_access_check(const SEC_DESC *sd, const NT_USER_TOKEN *token, - uint32 acc_desired, uint32 *acc_granted, - NTSTATUS *status); +NTSTATUS se_access_check(const SEC_DESC *sd, const NT_USER_TOKEN *token, + uint32 acc_desired, uint32 *acc_granted); NTSTATUS samr_make_sam_obj_sd(TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd_size); /* The following definitions come from lib/util_sec.c */ |