summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-11-21 19:26:02 +0100
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2010-03-06 10:44:33 +0100
commit9442a5593d6de13e14e5df3b62e9fa295f42b3bd (patch)
tree06bbe52a7e3a82a0e2545159499eac40a593a10f
parentc61c9c3a4cda79fb82adf59bcb563d85797b9b76 (diff)
downloadsamba-9442a5593d6de13e14e5df3b62e9fa295f42b3bd.tar.gz
samba-9442a5593d6de13e14e5df3b62e9fa295f42b3bd.tar.bz2
samba-9442a5593d6de13e14e5df3b62e9fa295f42b3bd.zip
s4:samr RPC - Change some counters to be "unsigned" where needed
The "count" size specifiers I typed "uint32_t" since they're often returned as an "uint32_t" (consider the IDL file). LDB counters need to be "signed" if they count till a limit of a "gendb*" call or "unsigned" if they count directly the number of objects.
-rw-r--r--source4/rpc_server/samr/dcesrv_samr.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 1199e1d23e..e2890f7ad7 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -327,7 +327,7 @@ static NTSTATUS dcesrv_samr_EnumDomains(struct dcesrv_call_state *dce_call, TALL
struct samr_connect_state *c_state;
struct dcesrv_handle *h;
struct samr_SamArray *array;
- int i, start_i;
+ uint32_t i, start_i;
*r->out.resume_handle = 0;
*r->out.sam = NULL;
@@ -1121,7 +1121,8 @@ static NTSTATUS dcesrv_samr_EnumDomainGroups(struct dcesrv_call_state *dce_call,
struct dcesrv_handle *h;
struct samr_domain_state *d_state;
struct ldb_message **res;
- int ldb_cnt, count, i, first;
+ int i, ldb_cnt;
+ uint32_t first, count;
struct samr_SamEntry *entries;
const char * const attrs[3] = { "objectSid", "sAMAccountName", NULL };
struct samr_SamArray *sam;
@@ -1488,7 +1489,9 @@ static NTSTATUS dcesrv_samr_EnumDomainUsers(struct dcesrv_call_state *dce_call,
struct dcesrv_handle *h;
struct samr_domain_state *d_state;
struct ldb_result *res;
- int ret, num_filtered_entries, i, first;
+ int ret;
+ unsigned int i;
+ uint32_t num_filtered_entries, first;
struct samr_SamEntry *entries;
const char * const attrs[] = { "objectSid", "sAMAccountName",
"userAccountControl", NULL };
@@ -1684,7 +1687,8 @@ static NTSTATUS dcesrv_samr_EnumDomainAliases(struct dcesrv_call_state *dce_call
struct dcesrv_handle *h;
struct samr_domain_state *d_state;
struct ldb_message **res;
- int ldb_cnt, count, i, first;
+ int i, ldb_cnt;
+ uint32_t first, count;
struct samr_SamEntry *entries;
const char * const attrs[3] = { "objectSid", "sAMAccountName", NULL };
struct samr_SamArray *sam;
@@ -1859,7 +1863,7 @@ static NTSTATUS dcesrv_samr_LookupNames(struct dcesrv_call_state *dce_call, TALL
{
struct dcesrv_handle *h;
struct samr_domain_state *d_state;
- int i, num_mapped;
+ uint32_t i, num_mapped;
NTSTATUS status = NT_STATUS_OK;
const char * const attrs[] = { "sAMAccountType", "objectSid", NULL };
int count;
@@ -1940,7 +1944,7 @@ static NTSTATUS dcesrv_samr_LookupRids(struct dcesrv_call_state *dce_call, TALLO
{
struct dcesrv_handle *h;
struct samr_domain_state *d_state;
- int i;
+ uint32_t i;
NTSTATUS status = NT_STATUS_OK;
struct lsa_String *names;
uint32_t *ids;
@@ -2444,7 +2448,7 @@ static NTSTATUS dcesrv_samr_QueryGroupMember(struct dcesrv_call_state *dce_call,
el = ldb_msg_find_element(res[0], "member");
if (el != NULL) {
- int i;
+ unsigned int i;
array->count = el->num_values;
@@ -2858,7 +2862,7 @@ static NTSTATUS dcesrv_samr_GetMembersInAlias(struct dcesrv_call_state *dce_call
el = ldb_msg_find_element(msgs[0], "member");
if (el != NULL) {
- int i;
+ unsigned int i;
sids = talloc_array(mem_ctx, struct lsa_SidPtr,
el->num_values);
@@ -3751,7 +3755,8 @@ static NTSTATUS dcesrv_samr_QueryDisplayInfo(struct dcesrv_call_state *dce_call,
struct dcesrv_handle *h;
struct samr_domain_state *d_state;
struct ldb_message **res;
- int ldb_cnt, count, i;
+ int i, ldb_cnt;
+ uint32_t count;
const char * const attrs[] = { "objectSid", "sAMAccountName",
"displayName", "description", "userAccountControl",
"pwdLastSet", NULL };