summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-11-07 21:20:12 +0100
committerAndrew Bartlett <abartlet@samba.org>2010-02-25 08:17:11 +1100
commite912d507093b7c22130158ef0bf2c0c4ffc78bac (patch)
tree9a09f0a75d4f01e62bc6a9e65e68f5eb4acd969f
parentf10fc7c16e3c71603e34c58fc0329f6d01d89603 (diff)
downloadsamba-e912d507093b7c22130158ef0bf2c0c4ffc78bac.tar.gz
samba-e912d507093b7c22130158ef0bf2c0c4ffc78bac.tar.bz2
samba-e912d507093b7c22130158ef0bf2c0c4ffc78bac.zip
s4:auth - make some parts "signed-safe"
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/auth/sam.c7
-rw-r--r--source4/auth/system_session.c8
2 files changed, 8 insertions, 7 deletions
diff --git a/source4/auth/sam.c b/source4/auth/sam.c
index 7d2f249b06..3ded739f6a 100644
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -299,10 +299,11 @@ static bool sids_contains_sid(const struct dom_sid **sids, const int num_sids,
static NTSTATUS authsam_expand_nested_groups(struct ldb_context *sam_ctx,
const struct dom_sid *sid, const bool only_childs,
TALLOC_CTX *res_sids_ctx, struct dom_sid ***res_sids,
- int *num_res_sids)
+ unsigned int *num_res_sids)
{
const char * const attrs[] = { "memberOf", NULL };
- int i, ret;
+ unsigned int i;
+ int ret;
bool already_there;
struct ldb_dn *tmp_dn;
struct dom_sid *tmp_sid;
@@ -390,7 +391,7 @@ _PUBLIC_ NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx,
struct dom_sid *primary_group_sid;
/* SID structures for the expanded group memberships */
struct dom_sid **groupSIDs = NULL, **groupSIDs_2 = NULL;
- int num_groupSIDs = 0, num_groupSIDs_2 = 0, i;
+ unsigned int num_groupSIDs = 0, num_groupSIDs_2 = 0, i;
uint32_t userAccountControl;
server_info = talloc(mem_ctx, struct auth_serversupplied_info);
diff --git a/source4/auth/system_session.c b/source4/auth/system_session.c
index 765f53a613..a1b04604a6 100644
--- a/source4/auth/system_session.c
+++ b/source4/auth/system_session.c
@@ -38,13 +38,13 @@
static NTSTATUS create_token(TALLOC_CTX *mem_ctx,
struct dom_sid *user_sid,
struct dom_sid *group_sid,
- int n_groupSIDs,
+ unsigned int n_groupSIDs,
struct dom_sid **groupSIDs,
bool is_authenticated,
struct security_token **token)
{
struct security_token *ptoken;
- int i;
+ unsigned int i;
ptoken = security_token_initialise(mem_ctx);
NT_STATUS_HAVE_NO_MEMORY(ptoken);
@@ -325,12 +325,12 @@ NTSTATUS auth_system_server_info(TALLOC_CTX *mem_ctx, const char *netbios_name,
static NTSTATUS create_admin_token(TALLOC_CTX *mem_ctx,
struct dom_sid *user_sid,
struct dom_sid *group_sid,
- int n_groupSIDs,
+ unsigned int n_groupSIDs,
struct dom_sid **groupSIDs,
struct security_token **token)
{
struct security_token *ptoken;
- int i;
+ unsigned int i;
ptoken = security_token_initialise(mem_ctx);
NT_STATUS_HAVE_NO_MEMORY(ptoken);