sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

s4:libcli/security/*.c - fix some wrong typed counters

Browse Source 
According to "librpc/gen_ndr/security.h" they need to be "uint32_t".
This commit is contained in:
Matthias Dieter Wallnöfer 2010-09-09 20:31:38 +02:00
parent 4f5dd3f93b
commit 59559bd02f
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source4/libcli/security/access_check.c
View File

@ -29,7 +29,7 @@ static uint32_t access_check_max_allowed(const struct security_descriptor *sd,
const struct security_token *token) const struct security_token *token)
{ {
uint32_t denied = 0, granted = 0; uint32_t denied = 0, granted = 0;
unsigned i; uint32_t i;
if (security_token_has_sid(token, sd->owner_sid)) { if (security_token_has_sid(token, sd->owner_sid)) {
granted |= SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL | SEC_STD_DELETE; granted |= SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL | SEC_STD_DELETE;
@ -91,7 +91,7 @@ NTSTATUS sec_access_check(const struct security_descriptor *sd,
uint32_t access_desired, uint32_t access_desired,
uint32_t *access_granted) uint32_t *access_granted)
{ {
int i; uint32_t i;
uint32_t bits_remaining; uint32_t bits_remaining;
*access_granted = access_desired; *access_granted = access_desired;
@ -183,7 +183,7 @@ NTSTATUS sec_access_check_ds(const struct security_descriptor *sd,
struct object_tree *tree, struct object_tree *tree,
struct dom_sid *replace_sid) struct dom_sid *replace_sid)
{ {
int i; uint32_t i;
uint32_t bits_remaining; uint32_t bits_remaining;
struct object_tree *node; struct object_tree *node;
const struct GUID *type; const struct GUID *type;
@ -300,6 +300,3 @@ done:
return NT_STATUS_OK; return NT_STATUS_OK;
} }

4
source4/libcli/security/create_descriptor.c
View File

@ -90,7 +90,7 @@ static struct security_acl *calculate_inherited_from_parent(TALLOC_CTX *mem_ctx,
struct dom_sid *group, struct dom_sid *group,
struct GUID *object_list) struct GUID *object_list)
{ {
int i; uint32_t i;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx); TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
struct security_acl *tmp_acl = talloc_zero(mem_ctx, struct security_acl); struct security_acl *tmp_acl = talloc_zero(mem_ctx, struct security_acl);
struct dom_sid *co, *cg; struct dom_sid *co, *cg;
@ -173,7 +173,7 @@ static struct security_acl *process_user_acl(TALLOC_CTX *mem_ctx,
struct dom_sid *group, struct dom_sid *group,
struct GUID *object_list) struct GUID *object_list)
{ {
int i; uint32_t i;
TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx); TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
struct security_acl *tmp_acl = talloc_zero(tmp_ctx, struct security_acl); struct security_acl *tmp_acl = talloc_zero(tmp_ctx, struct security_acl);
struct security_acl *new_acl; struct security_acl *new_acl;

4
source4/libcli/security/security_token.c
View File

@ -49,7 +49,7 @@ struct security_token *security_token_initialise(TALLOC_CTX *mem_ctx)
void security_token_debug(int dbg_lev, const struct security_token *token) void security_token_debug(int dbg_lev, const struct security_token *token)
{ {
TALLOC_CTX *mem_ctx; TALLOC_CTX *mem_ctx;
int i; uint32_t i;
if (!token) { if (!token) {
DEBUG(dbg_lev, ("Security token: (NULL)\n")); DEBUG(dbg_lev, ("Security token: (NULL)\n"));
@ -107,7 +107,7 @@ bool security_token_is_anonymous(const struct security_token *token)
bool security_token_has_sid(const struct security_token *token, const struct dom_sid *sid) bool security_token_has_sid(const struct security_token *token, const struct dom_sid *sid)
{ {
int i; uint32_t i;
for (i = 0; i < token->num_sids; i++) { for (i = 0; i < token->num_sids; i++) {
if (dom_sid_equal(&token->sids[i], sid)) { if (dom_sid_equal(&token->sids[i], sid)) {
return true; return true;